[FFmpeg-cvslog] avformat/utils: Do not wait for more than 1 frame on attachments

Michael Niedermayer git at videolan.org
Sat Mar 19 22:59:50 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Mar 19 22:11:34 2016 +0100| [0ffa9e6ebae3be30ac84aed489ad723567a68f3d] | committer: Michael Niedermayer

avformat/utils: Do not wait for more than 1 frame on attachments

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ffa9e6ebae3be30ac84aed489ad723567a68f3d
---

 libavformat/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2936ed5..5cff3a7 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3313,7 +3313,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
                 break;
             if (st->first_dts == AV_NOPTS_VALUE &&
                 !(ic->iformat->flags & AVFMT_NOTIMESTAMPS) &&
-                st->codec_info_nb_frames < ic->max_ts_probe &&
+                st->codec_info_nb_frames < ((st->disposition & AV_DISPOSITION_ATTACHED_PIC) ? 1 : ic->max_ts_probe) &&
                 (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
                  st->codec->codec_type == AVMEDIA_TYPE_AUDIO))
                 break;



More information about the ffmpeg-cvslog mailing list