summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-10-27 16:30:38 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-14 09:40:27 +0100
commitb45c87083de67969c1598cfef41e7c947b137922 (patch)
tree8d838d4bba017d230124d34571adab34a00fe21e
parent8941971a8f2e24b9a84fe29f128d13ceb89c0a65 (diff)
lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
-rw-r--r--libavcodec/avcodec.h2
-rw-r--r--libavcodec/version.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5a05b97921..ad80a289de 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -831,10 +831,12 @@ typedef struct AVPanScan{
int16_t position[3][2];
}AVPanScan;
+#if FF_API_QSCALE_TYPE
#define FF_QSCALE_TYPE_MPEG1 0
#define FF_QSCALE_TYPE_MPEG2 1
#define FF_QSCALE_TYPE_H264 2
#define FF_QSCALE_TYPE_VP56 3
+#endif
#if FF_API_GET_BUFFER
#define FF_BUFFER_TYPE_INTERNAL 1
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 954d1201bd..ea79bd953c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -103,5 +103,8 @@
#ifndef FF_API_ERROR_RATE
#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_QSCALE_TYPE
+#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
#endif /* AVCODEC_VERSION_H */