Commit 7dc1bea3 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Michael Niedermayer

non-avc h264 stream problems patch by ("Ronald S. Bultje" rbultje, ronald bitfreak net)

Originally committed as revision 4368 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 41061adf
......@@ -7343,7 +7343,7 @@ static int decode_frame(AVCodecContext *avctx,
}
if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){
if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) )
if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
return -1;
}
......
......@@ -77,6 +77,7 @@ void end_tag(ByteIOContext *pb, offset_t start)
important if multiple tags possible for a given codec. */
const CodecTag codec_bmp_tags[] = {
{ CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
{ CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
{ CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
......
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