diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2007-10-01 22:11:10 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-10-01 22:11:10 +0000 |
| commit | 3303926c2f06841270281e7f5210c0c94292e089 (patch) | |
| tree | 254f344d5c70fcc728392bc708f28aa28a7c247d | |
| parent | 64d8ef0bb743c6c44bb2a31c10b36a35d0a19475 (diff) | |
| download | ffmpeg-3303926c2f06841270281e7f5210c0c94292e089.tar.gz | |
Add checking for codecid to has_codec_parameters().
patch by Ronald S. Bultje, rsbultje gmail com
Date: Sat, 29 Sep 2007 09:25:52 -0400
Subject: [FFmpeg-devel] [PATCH] has_codec_parameters() addition
Originally committed as revision 10636 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/utils.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 0892513dd8..c85b119b9e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1638,7 +1638,7 @@ static int has_codec_parameters(AVCodecContext *enc) val = 1; break; } - return (val != 0); + return (enc->codec_id != CODEC_ID_NONE && val != 0); } static int try_decode_frame(AVStream *st, const uint8_t *data, int size) @@ -1803,9 +1803,6 @@ int av_find_stream_info(AVFormatContext *ic) break; if(st->parser && st->parser->parser->split && !st->codec->extradata) break; - if (st->codec->codec_type == CODEC_TYPE_AUDIO && - st->codec->codec_id == CODEC_ID_NONE) - break; if(st->first_dts == AV_NOPTS_VALUE) break; } |