summaryrefslogtreecommitdiffstats
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-15 17:29:38 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-15 18:02:47 +0200
commitc311713ca99cb0556609972ba60d3634dc96c7a0 (patch)
treee664c2e39639f0189fe9255fb7dda2ef86a22869 /libavformat/avformat.h
parent7404f3bdb90e6a5dcb59bc0a091e2c5c038e557d (diff)
downloadffmpeg-streaming-c311713ca99cb0556609972ba60d3634dc96c7a0.zip
ffmpeg-streaming-c311713ca99cb0556609972ba60d3634dc96c7a0.tar.gz
lavf: Switch bitrate to 64bit unless compatibility with avconv was requested.
Based on a patch by Steve Swanson, swanysteve at gmail. Fixes ticket #2089.
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b7f18c1..825e636 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1358,7 +1358,11 @@ typedef struct AVFormatContext {
* available. Never set it directly if the file_size and the
* duration are known as FFmpeg can compute it automatically.
*/
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
int bit_rate;
+#else
+ int64_t bit_rate;
+#endif
unsigned int packet_size;
int max_delay;
OpenPOWER on IntegriCloud