lavc: remove the FF_API_OPT_SHOW cruft.

pull/2/head
Anton Khirnov 14 years ago
parent 42420e7b94
commit 20d33ee8b1
  1. 7
      libavcodec/opt.c
  2. 6
      libavcodec/opt.h
  3. 3
      libavcodec/version.h

@ -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

@ -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 */

@ -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

Loading…
Cancel
Save