[FFmpeg-cvslog] r21805 - trunk/libavcodec/vp3.c

[conrad]

Author: conrad
Date: Sat Feb 13 19:59:25 2010
New Revision: 21805

Log:
Move CODEC_FLAG_GRAY check to outer loop

Modified:
   trunk/libavcodec/vp3.c

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	Sat Feb 13 19:59:21 2010	(r21804)
+++ trunk/libavcodec/vp3.c	Sat Feb 13 19:59:25 2010	(r21805)
@@ -1406,6 +1406,8 @@ static void render_slice(Vp3DecodeContex
         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(Vp3DecodeContex
                 }
 
                 /* 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))