[FFmpeg-cvslog] lavf: factor out determinable_frame_size()
Michael Niedermayer
git at videolan.org
Sun Mar 4 04:47:45 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 4 04:06:15 2012 +0100| [b8afbbca9c4e96881e8e22018c675ed5b915fea6] | committer: Michael Niedermayer
lavf: factor out determinable_frame_size()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8afbbca9c4e96881e8e22018c675ed5b915fea6
---
libavformat/utils.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7f6bfaa..bf8abee 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -752,6 +752,17 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
/**********************************************************/
+static int determinable_frame_size(AVCodecContext *avctx)
+{
+ if (avctx->codec_id == CODEC_ID_AAC ||
+ avctx->codec_id == CODEC_ID_MP1 ||
+ avctx->codec_id == CODEC_ID_MP2 ||
+ avctx->codec_id == CODEC_ID_MP3 ||
+ avctx->codec_id == CODEC_ID_CELT)
+ return 1;
+ return 0;
+}
+
/**
* Get the number of samples of an audio frame. Return -1 on error.
*/
@@ -2101,12 +2112,7 @@ 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_AAC ||
- avctx->codec_id == CODEC_ID_MP1 ||
- avctx->codec_id == CODEC_ID_MP2 ||
- avctx->codec_id == CODEC_ID_MP3 ||
- avctx->codec_id == CODEC_ID_CELT))
+ if (!avctx->frame_size && determinable_frame_size(avctx))
return 0;
break;
case AVMEDIA_TYPE_VIDEO:
More information about the ffmpeg-cvslog
mailing list