[SCM] libav/experimental: 10l

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 129dfab2c709b0b2881687bf04ca73a139587029
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Apr 14 20:02:12 2003 +0000

    10l
    
    Originally committed as revision 1774 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ea269ef..7f11869 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -601,7 +601,7 @@ int MPV_encode_init(AVCodecContext *avctx)
         return -1;
     }
     
-    if(s->max_b_frames && (s->codec_id != CODEC_ID_MPEG4 || s->codec_id != CODEC_ID_MPEG1VIDEO)){
+    if(s->max_b_frames && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG1VIDEO){
         fprintf(stderr, "b frames not supporetd by codec\n");
         return -1;
     }

-- 
Libav/FFmpeg packaging