aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-09-04 21:38:45 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-09-04 21:38:45 +0000
commit1d07029feac862056136ca46299b1d4d30375f5b (patch)
treef84f73a267746c09c15377f6f9702d8eb0b0b07f
parent83614f2df9a69929cec611571bddc35ea2969207 (diff)
downloadffmpeg-1d07029feac862056136ca46299b1d4d30375f5b.tar.gz
Add frame_size as a codec parameter requirement for Speex in
av_find_stream_info(). It forces decoding of a packet when there is no Speex header in order to determine the correct frame size. Originally committed as revision 19760 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 4cec2863f3..59fefd2913 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1862,7 +1862,8 @@ static int has_codec_parameters(AVCodecContext *enc)
val = enc->sample_rate && enc->channels && enc->sample_fmt != SAMPLE_FMT_NONE;
if(!enc->frame_size &&
(enc->codec_id == CODEC_ID_VORBIS ||
- enc->codec_id == CODEC_ID_AAC))
+ enc->codec_id == CODEC_ID_AAC ||
+ enc->codec_id == CODEC_ID_SPEEX))
return 0;
break;
case CODEC_TYPE_VIDEO: