aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-20 18:55:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-20 18:55:22 +0100
commiteef74b2e97139d8422f76a0f8241aed17fc0617d (patch)
treea3b2851c96fbe1cd527f1444c9bcdd47cfe99e61 /libavcodec/version.h
parent8001e9f7d17e90b4b0898ba64e3b8bbd716c513c (diff)
parent93c553c71ef48550ff7c2aa7b5712a7e01f1999f (diff)
downloadffmpeg-eef74b2e97139d8422f76a0f8241aed17fc0617d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width(). Conflicts: doc/APIchanges libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r--libavcodec/version.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h
index e731bae585..df196fc152 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 48
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -138,5 +138,8 @@
#ifndef FF_API_NEG_LINESIZES
#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_EMU_EDGE
+#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
#endif /* AVCODEC_VERSION_H */