[SCM] libav/experimental: seems wmv8 doesnt use intra-inter prediction

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit da63aac58518e97ed682846004682d3abcfc0d64
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Apr 16 18:50:30 2004 +0000

    seems wmv8 doesnt use intra-inter prediction
    
    Originally committed as revision 3024 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 5ea6224..376f070 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -181,7 +181,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
         put_bits(&s->pb, 1, s->dc_table_index);
         put_bits(&s->pb, 1, s->mv_table_index);
     
-        s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
+        s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
     }
     s->esc3_level_length= 0;
     s->esc3_run_length= 0;
@@ -443,7 +443,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
         s->dc_table_index = get_bits1(&s->gb);
         s->mv_table_index = get_bits1(&s->gb);
     
-        s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
+        s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
         s->no_rounding ^= 1;
         
         if(s->avctx->debug&FF_DEBUG_PICT_INFO){

-- 
Libav/FFmpeg packaging