[FFmpeg-cvslog] avformat: do not require frame_size in avformat_find_stream_info() for CELT

Justin Ruggles git at videolan.org
Tue Mar 6 06:15:58 CET 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Mon Feb 27 02:46:03 2012 -0500| [9c365fe8aef7ca0df35119815fddfbe5ab9e7279] | committer: Justin Ruggles

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c365fe8aef7ca0df35119815fddfbe5ab9e7279
---

 libavformat/utils.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 4677a11..7e66962 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;



More information about the ffmpeg-cvslog mailing list