| @@ -98,14 +98,6 @@ int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt) | |||||
| 0 : sample_fmt_info[sample_fmt].bits >> 3; | 0 : sample_fmt_info[sample_fmt].bits >> 3; | ||||
| } | } | ||||
| #if FF_API_GET_BITS_PER_SAMPLE_FMT | |||||
| int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt) | |||||
| { | |||||
| return sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB ? | |||||
| 0 : sample_fmt_info[sample_fmt].bits; | |||||
| } | |||||
| #endif | |||||
| int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) | int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) | ||||
| { | { | ||||
| if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) | if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) | ||||
| @@ -111,14 +111,6 @@ enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt); | |||||
| */ | */ | ||||
| char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt); | char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt); | ||||
| #if FF_API_GET_BITS_PER_SAMPLE_FMT | |||||
| /** | |||||
| * @deprecated Use av_get_bytes_per_sample() instead. | |||||
| */ | |||||
| attribute_deprecated | |||||
| int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt); | |||||
| #endif | |||||
| /** | /** | ||||
| * Return number of bytes per sample. | * Return number of bytes per sample. | ||||
| * | * | ||||
| @@ -61,9 +61,6 @@ | |||||
| * @{ | * @{ | ||||
| */ | */ | ||||
| #ifndef FF_API_GET_BITS_PER_SAMPLE_FMT | |||||
| #define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52) | |||||
| #endif | |||||
| #ifndef FF_API_FIND_OPT | #ifndef FF_API_FIND_OPT | ||||
| #define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 52) | #define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 52) | ||||
| #endif | #endif | ||||