From 2e8b0446c6798947dac77fee4a06f9c4e8131ab5 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 10 Jan 2019 22:23:39 +0100 Subject: [PATCH] lavc: Allow very high bitrates in AVCPBProperties after next version bump. --- libavcodec/avcodec.h | 12 ++++++++++++ libavcodec/version.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 92567ec6d0b..4414853e845 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 aa16bb24a0d..4adde7756f5 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 */ -- 2.39.2