diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 12:27:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 13:25:09 +0200 |
| commit | 215db2935b06c0e936dadce012a31de7da25ba97 (patch) | |
| tree | 6ba41973c6902ce6e18d9cfa31330ab5fa290da2 /libavformat/utils.c | |
| parent | f1b04f803eafa17dbfa19977b1a76f412183478e (diff) | |
| parent | b263f8ffe7599d9cd27ec477a12700da8eb2790d (diff) | |
Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'
* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
lavf: add AVFormatContext.max_ts_probe
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index b4ca342898..14896cc49c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3064,6 +3064,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->codec_type == AVMEDIA_TYPE_VIDEO || st->codec->codec_type == AVMEDIA_TYPE_AUDIO)) break; |