Commit f85c9b77 authored by Michael Niedermayer's avatar Michael Niedermayer

h264dec: fix decoding problems introduced with baad01d8.

This affected cases where extradata was not set.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 537a9e5c
......@@ -1083,7 +1083,8 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){
avctx->ticks_per_frame = 2;
}
if(ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size))
if(avctx->extradata_size > 0 && avctx->extradata &&
ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size))
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