diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-02-27 02:46:03 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-03-05 13:08:16 -0500 |
| commit | 9c365fe8aef7ca0df35119815fddfbe5ab9e7279 (patch) | |
| tree | b4af5dc1cfc68f6b63c901f7d6e21683e2b8f0f1 | |
| parent | fbc8c59679e13831f5e835761d859858aae368a4 (diff) | |
| download | ffmpeg-9c365fe8aef7ca0df35119815fddfbe5ab9e7279.tar.gz | |
avformat: do not require frame_size in avformat_find_stream_info() for CELT
In Ogg/CELT, frame_size is found in the same place as the sample_rate and
channels, so we do not need to force the frame_size to be parsed.
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 4677a11d32..7e66962b9a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2018,9 +2018,6 @@ static int has_codec_parameters(AVCodecContext *avctx) switch (avctx->codec_type) { case AVMEDIA_TYPE_AUDIO: val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE; - if (!avctx->frame_size && - avctx->codec_id == CODEC_ID_CELT)) - return 0; break; case AVMEDIA_TYPE_VIDEO: val = avctx->width && avctx->pix_fmt != PIX_FMT_NONE; |