Browse Source

lavc: remove the FF_API_OPT_SHOW cruft.

Anton Khirnov 14 years ago
parent
commit
20d33ee8b1
3 changed files with 0 additions and 16 deletions
  1. 0 7
      libavcodec/opt.c
  2. 0 6
      libavcodec/opt.h
  3. 0 3
      libavcodec/version.h

+ 0 - 7
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

+ 0 - 6
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 */

+ 0 - 3
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