apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-27 19:02:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavc/lavf: remove incompatible abi checks for the new 64bit fields

Browse Source 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2015-09-16 01:46:50 -03:00
parent 245bf7c18a
commit 655b6dcb34
7 changed files with 11 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/utils.c
View File

@@ -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;