mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'
* commit '4476027d93680cd88d2f75ef1cef5b0c276a8704': lavc: Drop deprecated avctx codec name Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
5a2e581879
@ -1507,13 +1507,6 @@ 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 */
|
||||
|
||||
/**
|
||||
|
@ -57,9 +57,6 @@
|
||||
#ifndef FF_API_DEBUG_MV
|
||||
#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_CODEC_NAME
|
||||
#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_AFD
|
||||
#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user