Commit e4a714f6 authored by Michael Niedermayer's avatar Michael Niedermayer

h264: Return the correct number of bytes for mid strea, extradata.

Fixes the hang with Ticket952
Tested-by: 's avatarNicolas George <nicolas.george@normalesup.org>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 146ef3f3
......@@ -1125,7 +1125,7 @@ int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size)
if(decode_nal_units(h, buf, size) < 0)
return -1;
}
return 0;
return size;
}
av_cold int ff_h264_decode_init(AVCodecContext *avctx){
......@@ -1170,7 +1170,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){
}
if(avctx->extradata_size > 0 && avctx->extradata &&
ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size))
ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size)<0)
return -1;
if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames < h->sps.num_reorder_frames){
......
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