virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Move CODEC_FLAG_GRAY check to outer loop

Browse Source 
Originally committed as revision 21805 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-02-13 18:59:25 +00:00
parent 7c2e31d1f0
commit 161e8cf42c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/vp3.c
View File

@ -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)
} }
/* 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))