diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-14 21:14:00 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-10-05 17:09:49 -0300 |
| commit | 1abb77285cff29eb00b766bdaa68fb4b757455aa (patch) | |
| tree | 80e8e176753982a757c75a0db997347b1319994b | |
| parent | 42111bb960b5c2289a4feb4aa8ab1ef45a02b2fc (diff) | |
| download | ffmpeg-1abb77285cff29eb00b766bdaa68fb4b757455aa.tar.gz | |
avutil: remove obsolete FF_API_GET_BITS_PER_SAMPLE_FMT cruft
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/samplefmt.c | 8 | ||||
| -rw-r--r-- | libavutil/samplefmt.h | 8 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index a1986980f0..3d415a183f 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -107,14 +107,6 @@ int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt) 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) { if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index 2c346a3ce3..6a8a031c02 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -129,14 +129,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); -#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. * diff --git a/libavutil/version.h b/libavutil/version.h index f73f33441c..f93798de2a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,9 +80,6 @@ * @{ */ -#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT -#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 54) -#endif #ifndef FF_API_FIND_OPT #define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54) #endif |