eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavf: Switch bitrate to 64bit unless compatibility with avconv was requested.

Browse Source 
Based on a patch by Steve Swanson, swanysteve at gmail.

Fixes ticket #2089.
This commit is contained in:
Carl Eugen Hoyos
2015-09-15 17:29:38 +02:00
parent 7404f3bdb9
commit c311713ca9
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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 && bitrate <= INT_MAX)
if (bitrate >= 0 && (!AV_HAVE_INCOMPATIBLE_LIBAV_ABI || bitrate <= INT_MAX))
ic->bit_rate = bitrate;
}
}
@@ -2614,10 +2614,10 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset)
(double) st->duration / AV_TIME_BASE);
}
av_log(ic, AV_LOG_TRACE,
"stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s\n",
"stream: start_time: %0.3f duration: %0.3f bitrate=%"PRId64" kb/s\n",
(double) ic->start_time / AV_TIME_BASE,
(double) ic->duration / AV_TIME_BASE,
ic->bit_rate / 1000);
(int64_t)ic->bit_rate / 1000);
}
}