[FFmpeg-devel] [PATCH 04/13] lavc: remove the FF_API_OPT_SHOW cruft.

[Anton Khirnov]

---
 libavcodec/avcodec.h |    3 ---
 libavcodec/opt.c     |    7 -------
 libavcodec/opt.h     |    6 ------
 3 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 12d388d..cf0c5f7 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -52,9 +52,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
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index ffa422e..92ab323 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 9514759..1c7273a 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 */
-- 
1.7.2.3