Commit 3303926c authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Diego Biurrun

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
parent 64d8ef0b
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment