X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Favcodec.h;h=872a9a5ee447495ce4ec3445e02f447b40ffc139;hb=2f9ab159607fd088f8ced1e603da14d203fbfffe;hp=aac51985f0cb2accf4be6ce1cffacb04df56cdef;hpb=c2972a2800242229ac22e882fe60245a44ac026c;p=ffmpeg diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index aac51985f0c..872a9a5ee44 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 /**