[SCM] libav/experimental: Move CODEC_FLAG_GRAY check to outer loop

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 161e8cf42c1a42b1a60f94f745d1b053cb910959
Author: David Conrad <lessen42 at gmail.com>
Date:   Sat Feb 13 18:59:25 2010 +0000

    Move CODEC_FLAG_GRAY check to outer loop
    
    Originally committed as revision 21805 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index b4699b7..0f3d7eb 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))

-- 
Libav/FFmpeg packaging