diff options
| author | James Almer <jamrial@gmail.com> | 2015-09-16 01:46:50 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-09-17 11:36:16 -0300 |
| commit | 655b6dcb34b25d591e15ede17673ea6cb8074711 (patch) | |
| tree | 6a31b795fb22a327663b7643ea49abc9bbb55a2d /libavformat/utils.c | |
| parent | 245bf7c18a71fa3800bb4c3fcea5e08ba90b4f2c (diff) | |
lavc/lavf: remove incompatible abi checks for the new 64bit fields
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 0d68dee6c7..b1f95fff0b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2369,7 +2369,7 @@ static void update_stream_timings(AVFormatContext *ic) /* compute the bitrate */ double bitrate = (double) filesize * 8.0 * AV_TIME_BASE / (double) ic->duration; - if (bitrate >= 0 && (!AV_HAVE_INCOMPATIBLE_LIBAV_ABI || bitrate <= INT_MAX)) + if (bitrate >= 0 && bitrate <= INT64_MAX) ic->bit_rate = bitrate; } } @@ -3085,18 +3085,10 @@ 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 AV_HAVE_INCOMPATIBLE_LIBAV_ABI - 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 AV_HAVE_INCOMPATIBLE_LIBAV_ABI - int64_t probesize = ic->probesize2; -#else int64_t probesize = ic->probesize; -#endif if (!max_analyze_duration) max_analyze_duration = ic->max_analyze_duration; |