Commit 299c0b30 authored by Michael Niedermayer's avatar Michael Niedermayer

lavf: fix bug that caused has_decode_delay_been_guessed() to never return !=0

Possibly fixes Ticket1724
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4b80a619
...@@ -911,6 +911,8 @@ static int is_intra_only(AVCodecContext *enc){ ...@@ -911,6 +911,8 @@ static int is_intra_only(AVCodecContext *enc){
static int has_decode_delay_been_guessed(AVStream *st) static int has_decode_delay_been_guessed(AVStream *st)
{ {
if(st->codec->codec_id != AV_CODEC_ID_H264) return 1; if(st->codec->codec_id != AV_CODEC_ID_H264) return 1;
if(!st->info) // if we have left find_stream_info then nb_decoded_frames wont increase anymore for stream copy
return 1;
#if CONFIG_H264_DECODER #if CONFIG_H264_DECODER
if(st->codec->has_b_frames && if(st->codec->has_b_frames &&
avpriv_h264_has_num_reorder_frames(st->codec) == st->codec->has_b_frames) avpriv_h264_has_num_reorder_frames(st->codec) == st->codec->has_b_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