diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-01 09:19:49 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-01 09:19:49 +0200 |
| commit | 670d8ecfae5201f8c2d5693495c2f763cbbc2d72 (patch) | |
| tree | 9bb894f5e6a9b39eca1c8d69e0f3848de7aefe8a /libavformat/utils.c | |
| parent | 0cb6c0ec488e324443b49b36f1224d3e5af420c4 (diff) | |
| download | ffmpeg-670d8ecfae5201f8c2d5693495c2f763cbbc2d72.tar.gz | |
lavf: Remove probesize32 and max_analyze_duration32 on version bump.
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit
max_analyze_duration after the next libavformat version bump.
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 758b9400b1..3833b1ffb3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3091,10 +3091,18 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) // new streams might appear, no options for those int orig_nb_streams = ic->nb_streams; int flush_codecs; +#if FF_API_PROBESIZE_32 int64_t max_analyze_duration = ic->max_analyze_duration2; +#else + int64_t max_analyze_duration = ic->max_analyze_duration; +#endif int64_t max_stream_analyze_duration; int64_t max_subtitle_analyze_duration; +#if FF_API_PROBESIZE_32 int64_t probesize = ic->probesize2; +#else + int64_t probesize = ic->probesize; +#endif if (!max_analyze_duration) max_analyze_duration = ic->max_analyze_duration; |