mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'
* commit 'ba71c74017c287681153ec8f6f1cba650d797275': lavc: deprecate AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
58f4d1266b
|
@ -1257,7 +1257,13 @@ typedef struct AVCodecContext {
|
|||
|
||||
enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
|
||||
const struct AVCodec *codec;
|
||||
#if FF_API_CODEC_NAME
|
||||
/**
|
||||
* @deprecated this field is not used for anything in libavcodec
|
||||
*/
|
||||
attribute_deprecated
|
||||
char codec_name[32];
|
||||
#endif
|
||||
enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
|
||||
|
||||
/**
|
||||
|
|
|
@ -159,5 +159,8 @@
|
|||
#ifndef FF_API_MV0
|
||||
#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 57)
|
||||
#endif
|
||||
#ifndef FF_API_CODEC_NAME
|
||||
#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 57)
|
||||
#endif
|
||||
|
||||
#endif /* AVCODEC_VERSION_H */
|
||||
|
|
Loading…
Reference in New Issue