diff options
| author | David Conrad <lessen42@gmail.com> | 2010-02-13 18:59:25 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2010-02-13 18:59:25 +0000 |
| commit | 161e8cf42c1a42b1a60f94f745d1b053cb910959 (patch) | |
| tree | f673f2cada7ef3316b504efc7372c4d4ffce1459 /libavcodec | |
| parent | 7c2e31d1f0198fad23cddbd8f206a04173fe6d0d (diff) | |
| download | ffmpeg-161e8cf42c1a42b1a60f94f745d1b053cb910959.tar.gz | |
Move CODEC_FLAG_GRAY check to outer loop
Originally committed as revision 21805 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index b4699b7aea..0f3d7eb240 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1406,6 +1406,8 @@ static void render_slice(Vp3DecodeContext *s, int slice) int i = s->fragment_start[plane] + (y>>3)*(s->fragment_width>>!!plane); if (!s->flipped_image) stride = -stride; + if (CONFIG_GRAY && plane && (s->avctx->flags & CODEC_FLAG_GRAY)) + continue; if(FFABS(stride) > 2048) @@ -1424,8 +1426,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) } /* transform if this block was coded */ - if ((s->all_fragments[i].coding_method != MODE_COPY) && - !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) { + if (s->all_fragments[i].coding_method != MODE_COPY) { if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) |