[SCM] libav/experimental: fixing wmv1 slice decoding

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 26893f6bd433b01e30d7f81782ff1577a9b3491b
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Oct 13 19:53:32 2002 +0000

    fixing wmv1 slice decoding
    
    Originally committed as revision 1031 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 0f6364f..e2a0fc9 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -693,7 +693,7 @@ static inline int msmpeg4_pred_dc(MpegEncContext * s, int n,
     b = dc_val[ - 1 - wrap];
     c = dc_val[ - wrap];
     
-    if(s->first_slice_line && (n&2)==0){
+    if(s->first_slice_line && (n&2)==0 && s->msmpeg4_version!=4){
         b=c=1024;
     }
 

-- 
Libav/FFmpeg packaging