From 8207c67a2417ad74f406bbc6f61733fddd15c874 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 22 Oct 2012 14:36:14 +0200
Subject: lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

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

(limited to 'libavutil')

diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index 4f6dfd7889..389f726d65 100644
--- 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 0641c56bc5..33cbdedf5f 100644
--- 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 1bbebd9f0c..be2b334af1 100644
--- 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
-- 
cgit v1.2.3