[SCM] libav/experimental: Fix r21223: AVup samples (issue 1685) need a buf offset like AV1x (issue 1684).

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 36cbdc95393117d36885c9ba06f0df62f50cc46c
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Tue Feb 2 22:57:56 2010 +0000

    Fix r21223: AVup samples (issue 1685) need a buf offset like AV1x (issue 1684).
    
    Originally committed as revision 21617 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 20c2126..b4c7b3c 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -137,7 +137,8 @@ static int raw_decode(AVCodecContext *avctx,
         buf= dst;
     }
 
-    if(avctx->codec_tag == MKTAG('A', 'V', '1', 'x'))
+    if(avctx->codec_tag == MKTAG('A', 'V', '1', 'x') ||
+       avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
         buf += buf_size - context->length;
 
     if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0))

-- 
Libav/FFmpeg packaging