From 20d33ee8b1d2cf5ba4b4d4a81db0ff7b4a125dd3 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 3 Feb 2011 14:45:22 +0100
Subject: lavc: remove the FF_API_OPT_SHOW cruft.

---
 libavcodec/opt.c     | 7 -------
 libavcodec/opt.h     | 6 ------
 libavcodec/version.h | 3 ---
 3 files changed, 16 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index f41fae0ba1..3b89a3013c 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -80,10 +80,3 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
     return o;
 }
 #endif
-
-#if FF_API_OPT_SHOW
-int av_opt_show(void *obj, void *av_log_obj){
-    return av_opt_show2(obj, av_log_obj,
-                        AV_OPT_FLAG_ENCODING_PARAM|AV_OPT_FLAG_DECODING_PARAM, 0);
-}
-#endif
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index cf54354096..ece54aad24 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -45,11 +45,5 @@ attribute_deprecated const AVOption *av_set_string(void *obj, const char *name,
  */
 attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc);
 #endif
-#if FF_API_OPT_SHOW
-/**
- * @deprecated Use av_opt_show2() instead.
- */
-attribute_deprecated int av_opt_show(void *obj, void *av_log_obj);
-#endif
 
 #endif /* AVCODEC_OPT_H */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2b9856ce8b..08574f784b 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -41,9 +41,6 @@
 #ifndef FF_API_PALETTE_CONTROL
 #define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif
-#ifndef FF_API_OPT_SHOW
-#define FF_API_OPT_SHOW         (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_AUDIO_OLD
 #define FF_API_AUDIO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
 #endif
-- 
cgit v1.2.3