diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 16:28:38 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:28:38 -0300 |
| commit | 5a2e581879b8901b8660b82ff8d333d18fc629ff (patch) | |
| tree | f23f44735c3c45ec6a8bf89db168ab403a24cf99 /libavcodec | |
| parent | b79a7da36faa6bb5914b04800b548e99eb3b81ca (diff) | |
| parent | 4476027d93680cd88d2f75ef1cef5b0c276a8704 (diff) | |
| download | ffmpeg-5a2e581879b8901b8660b82ff8d333d18fc629ff.tar.gz | |
Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'
* commit '4476027d93680cd88d2f75ef1cef5b0c276a8704':
lavc: Drop deprecated avctx codec name
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 7 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1f76833f0e..9448075af2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 */ /** diff --git a/libavcodec/version.h b/libavcodec/version.h index e0be3d5021..3ad0db30ca 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -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 |