[SCM] libav/experimental: Implement cool new vlc code. Fixes issue1637

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ed3e91489bc38b8ec15908c6d11eabd032bcbcbc
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Feb 4 14:26:57 2010 +0000

    Implement cool new vlc code.
    Fixes issue1637
    
    Originally committed as revision 21635 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index fbdc2fa..60d104b 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -1732,9 +1732,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
                             if(s->qscale<8){
                                 ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s->gb, 3);
                                 if(ll==0){
-                                    if(SHOW_UBITS(re, &s->gb, 1)) av_log(s->avctx, AV_LOG_ERROR, "cool a new vlc code ,contact the ffmpeg developers and upload the file\n");
-                                    SKIP_BITS(re, &s->gb, 1);
-                                    ll=8;
+                                    ll= 8+SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
                                 }
                             }else{
                                 ll=2;

-- 
Libav/FFmpeg packaging