aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-22 22:05:20 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-22 22:05:20 +0000
commitb7884740fa2157c6d2a337012370c460e728d299 (patch)
treeb5e559ceaee21160cb787bd96df0643353785e71
parent6f5a3d0a7bb2a1e9deb09f8204e2b0eb7a922e02 (diff)
downloadffmpeg-b7884740fa2157c6d2a337012370c460e728d299.tar.gz
Make sure mp1/mp2 get their frame_size set.
Fixes issue1696 Originally committed as revision 21972 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 103a880cf1..5f6bdbb084 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1914,6 +1914,8 @@ static int has_codec_parameters(AVCodecContext *enc)
if(!enc->frame_size &&
(enc->codec_id == CODEC_ID_VORBIS ||
enc->codec_id == CODEC_ID_AAC ||
+ enc->codec_id == CODEC_ID_MP1 ||
+ enc->codec_id == CODEC_ID_MP2 ||
enc->codec_id == CODEC_ID_MP3 ||
enc->codec_id == CODEC_ID_SPEEX))
return 0;