aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-01 18:04:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-01 18:04:53 +0200
commit58f4d1266bce51f3b14d6d775ebf88bdcef33ef8 (patch)
treef62077fa3ca7b615001530be7071bce9b93adfe9 /libavcodec/avcodec.h
parentd1c359777f3ebccb7565043cd79347ab305758d8 (diff)
parentba71c74017c287681153ec8f6f1cba650d797275 (diff)
downloadffmpeg-58f4d1266bce51f3b14d6d775ebf88bdcef33ef8.tar.gz
Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'
* commit 'ba71c74017c287681153ec8f6f1cba650d797275': lavc: deprecate AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 35ecc6df9a..5c5d458ec5 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -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 */
/**