diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-15 18:01:32 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-15 18:02:43 +0200 |
| commit | 7404f3bdb90e6a5dcb59bc0a091e2c5c038e557d (patch) | |
| tree | 08d1d4010e20cd696e358bf03f9e2565f3256e0c /libavcodec/avcodec.h | |
| parent | 28e023377cfe42c5406441eeff32842c1bb1f09f (diff) | |
| download | ffmpeg-7404f3bdb90e6a5dcb59bc0a091e2c5c038e557d.tar.gz | |
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6e3edaaed7..aac51985f0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1532,7 +1532,11 @@ typedef struct AVCodecContext { * - decoding: Set by user, may be overwritten by libavcodec * if this info is available in the stream */ +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI int bit_rate; +#else + int64_t bit_rate; +#endif /** * number of bits the bitstream is allowed to diverge from the reference. @@ -2463,14 +2467,22 @@ typedef struct AVCodecContext { * - encoding: Set by user. * - decoding: Set by user, may be overwritten by libavcodec. */ +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI int rc_max_rate; +#else + int64_t rc_max_rate; +#endif /** * minimum bitrate * - encoding: Set by user. * - decoding: unused */ +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI int rc_min_rate; +#else + int64_t rc_min_rate; +#endif #if FF_API_MPV_OPT /** |