diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-26 04:53:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-26 04:53:03 +0200 |
| commit | 299c0b30a64a0746db2645c00a847930e01d58a4 (patch) | |
| tree | 3b483ce6941dd8e1cbe8fd9efd4eaa0428e98669 /libavformat/utils.c | |
| parent | 4b80a619b7db37157d98f6e5a57ddf53c9132551 (diff) | |
| download | ffmpeg-299c0b30a64a0746db2645c00a847930e01d58a4.tar.gz | |
lavf: fix bug that caused has_decode_delay_been_guessed() to never return !=0
Possibly fixes Ticket1724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d2d57f1bfa..5bc5ada0dd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -911,6 +911,8 @@ static int is_intra_only(AVCodecContext *enc){ static int has_decode_delay_been_guessed(AVStream *st) { 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(st->codec->has_b_frames && avpriv_h264_has_num_reorder_frames(st->codec) == st->codec->has_b_frames) |