summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-04-14 20:02:12 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-04-14 20:02:12 +0000
commit129dfab2c709b0b2881687bf04ca73a139587029 (patch)
tree78f3ab0e53eca3433b2555a5789def09a41a7438 /libavcodec
parent9acbbd16b9e506326d5daddb5b427f110eac7682 (diff)
10l
Originally committed as revision 1774 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ea269ef4ae..7f11869a68 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;
}