summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-01-10 22:23:39 +0100
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-01-12 17:32:29 +0100
commit2e8b0446c6798947dac77fee4a06f9c4e8131ab5 (patch)
tree33af4008787c729a7a98e295daecc2b0962866ed
parent90ab9a58ff697e0a7bfd89715cba5a8fb4074b35 (diff)
downloadffmpeg-streaming-2e8b0446c6798947dac77fee4a06f9c4e8131ab5.zip
ffmpeg-streaming-2e8b0446c6798947dac77fee4a06f9c4e8131ab5.tar.gz
lavc: Allow very high bitrates in AVCPBProperties after next version bump.
-rw-r--r--libavcodec/avcodec.h12
-rw-r--r--libavcodec/version.h3
2 files changed, 15 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 92567ec..4414853 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1118,17 +1118,29 @@ typedef struct AVCPBProperties {
* Maximum bitrate of the stream, in bits per second.
* Zero if unknown or unspecified.
*/
+#if FF_API_UNSANITIZED_BITRATES
int max_bitrate;
+#else
+ int64_t max_bitrate;
+#endif
/**
* Minimum bitrate of the stream, in bits per second.
* Zero if unknown or unspecified.
*/
+#if FF_API_UNSANITIZED_BITRATES
int min_bitrate;
+#else
+ int64_t min_bitrate;
+#endif
/**
* Average bitrate of the stream, in bits per second.
* Zero if unknown or unspecified.
*/
+#if FF_API_UNSANITIZED_BITRATES
int avg_bitrate;
+#else
+ int64_t avg_bitrate;
+#endif
/**
* The size of the buffer to which the ratecontrol is applied, in bits.
diff --git a/libavcodec/version.h b/libavcodec/version.h
index aa16bb2..4adde77 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -132,6 +132,9 @@
#ifndef FF_API_NEXT
#define FF_API_NEXT (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
+#ifndef FF_API_UNSANITIZED_BITRATES
+#define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59)
+#endif
#endif /* AVCODEC_VERSION_H */
OpenPOWER on IntegriCloud