From 4476027d93680cd88d2f75ef1cef5b0c276a8704 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Mon, 5 Dec 2016 17:08:15 -0500
Subject: [PATCH] lavc: Drop deprecated avctx codec name

Deprecated in 04/2014.
---
 libavcodec/avcodec.h | 7 -------
 libavcodec/version.h | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f7c879604e..e1f5d8ff6e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1219,13 +1219,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 04f701430e..99aa9bf8cc 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#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