diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 00:27:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 00:27:40 +0200 |
| commit | 7dea2eab7e3b37126f376fa73fc1242b42bd3db8 (patch) | |
| tree | d0bba3d170bb3c6438d80451734fb49507d5583a /libavformat | |
| parent | bcac6b438e67946199c75c189bba76de6c04dac4 (diff) | |
| parent | 5c2be81b39ce1e694f33b59057a0878a8e0ad111 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not suggest to increase probesize for image2 files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index af0284d709..ca8d845395 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2779,7 +2779,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) av_log(ic, AV_LOG_DEBUG, "Probe buffer size limit of %d bytes reached\n", ic->probesize); for (i = 0; i < ic->nb_streams; i++) if (!ic->streams[i]->r_frame_rate.num && - ic->streams[i]->info->duration_count <= 1) + ic->streams[i]->info->duration_count <= 1 && + strcmp(ic->iformat->name, "image2")) av_log(ic, AV_LOG_WARNING, "Stream #%d: not enough frames to estimate rate; " "consider increasing probesize\n", i); |