[libav-devel] [PATCH 2/5] lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump

Anton Khirnov anton at khirnov.net
Mon Nov 4 08:56:20 CET 2013


---
 libavcodec/avcodec.h |    2 ++
 libavcodec/version.h |    3 +++
 2 files changed, 5 insertions(+)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 102933a..e4dd916 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -815,10 +815,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 9e502b6..7e3b489 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -97,5 +97,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 */
-- 
1.7.10.4



More information about the libav-devel mailing list