[FFmpeg-cvslog] avutil: remove obsolete FF_API_GET_BITS_PER_SAMPLE_FMT cruft

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Sep 14 21:14:00 2014 -0300| [1abb77285cff29eb00b766bdaa68fb4b757455aa] | committer: James Almer

avutil: remove obsolete FF_API_GET_BITS_PER_SAMPLE_FMT cruft

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1abb77285cff29eb00b766bdaa68fb4b757455aa
---

 libavutil/samplefmt.c |    8 --------
 libavutil/samplefmt.h |    8 --------
 libavutil/version.h   |    3 ---
 3 files changed, 19 deletions(-)

diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index a198698..3d415a1 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 2c346a3..6a8a031 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 f73f334..f93798d 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