aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/version.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/version.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/version.h')
-rw-r--r--libavcodec/version.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h
index cd2b0d89c3..5294d8e283 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -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 */