diff options
| author | James Almer <jamrial@gmail.com> | 2015-09-16 01:46:50 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-09-17 11:36:16 -0300 |
| commit | 655b6dcb34b25d591e15ede17673ea6cb8074711 (patch) | |
| tree | 6a31b795fb22a327663b7643ea49abc9bbb55a2d /libavcodec/avcodec.h | |
| parent | 245bf7c18a71fa3800bb4c3fcea5e08ba90b4f2c (diff) | |
| download | ffmpeg-streaming-655b6dcb34b25d591e15ede17673ea6cb8074711.zip ffmpeg-streaming-655b6dcb34b25d591e15ede17673ea6cb8074711.tar.gz | |
lavc/lavf: remove incompatible abi checks for the new 64bit fields
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index aac5198..872a9a5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1532,11 +1532,7 @@ 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. @@ -2467,22 +2463,14 @@ 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 /** |
