[FFmpeg-cvslog] lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
Anton Khirnov
git at videolan.org
Thu Nov 14 13:49:59 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 27 16:30:38 2013 +0100| [b45c87083de67969c1598cfef41e7c947b137922] | committer: Anton Khirnov
lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b45c87083de67969c1598cfef41e7c947b137922
---
libavcodec/avcodec.h | 2 ++
libavcodec/version.h | 3 +++
2 files changed, 5 insertions(+)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5a05b97..ad80a28 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 954d120..ea79bd9 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 */
More information about the ffmpeg-cvslog
mailing list