Commit 61f533d0 authored by conrad's avatar conrad

Move CODEC_FLAG_GRAY check to outer loop

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21805 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ccca78b7
...@@ -1406,6 +1406,8 @@ static void render_slice(Vp3DecodeContext *s, int slice) ...@@ -1406,6 +1406,8 @@ static void render_slice(Vp3DecodeContext *s, int slice)
int i = s->fragment_start[plane] + (y>>3)*(s->fragment_width>>!!plane); int i = s->fragment_start[plane] + (y>>3)*(s->fragment_width>>!!plane);
if (!s->flipped_image) stride = -stride; if (!s->flipped_image) stride = -stride;
if (CONFIG_GRAY && plane && (s->avctx->flags & CODEC_FLAG_GRAY))
continue;
if(FFABS(stride) > 2048) if(FFABS(stride) > 2048)
...@@ -1424,8 +1426,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) ...@@ -1424,8 +1426,7 @@ static void render_slice(Vp3DecodeContext *s, int slice)
} }
/* transform if this block was coded */ /* transform if this block was coded */
if ((s->all_fragments[i].coding_method != MODE_COPY) && if (s->all_fragments[i].coding_method != MODE_COPY) {
!((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) {
if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
(s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment