highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc: remove the FF_API_OPT_SHOW cruft.

Browse Source
This commit is contained in:
Anton Khirnov
2011-02-03 14:45:22 +01:00
parent 42420e7b94
commit 20d33ee8b1
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/opt.c
View File

@@ -80,10 +80,3 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
return o; return o;
} }
#endif #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

6
libavcodec/opt.h
View File

@@ -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); attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc);
#endif #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 */ #endif /* AVCODEC_OPT_H */

3
libavcodec/version.h
View File

@@ -41,9 +41,6 @@
#ifndef FF_API_PALETTE_CONTROL #ifndef FF_API_PALETTE_CONTROL
#define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_OPT_SHOW
#define FF_API_OPT_SHOW (LIBAVCODEC_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_AUDIO_OLD #ifndef FF_API_AUDIO_OLD
#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif #endif