lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index 4f6dfd7889a3d8e6e3f8c8c3dba791cd6a6868e0..389f726d659d64f32d1f25b9b4cd51227001cf9c 100644 (file)
--- a/libavutil/samplefmt.c
+++ b/libavutil/samplefmt.c
@@ -98,14 +98,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 0641c56bc53c2051f6f2950f1aa9ddc5f9b2249e..33cbdedf5f0b6be5f3cabab8c167e5812321bd26 100644 (file)
--- a/libavutil/samplefmt.h
+++ b/libavutil/samplefmt.h
@@ -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);
 
-#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 1bbebd9f0c4766c3feaeefe3d36bfbf98e578ee4..be2b334af1b4b399ce4668fdeaa0a2757e44b6aa 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -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
 #define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 52)
 #endif