[FFmpeg-cvslog] avcodec/internal: move FF_QSCALE_TYPE defines from avcodec.h

James Almer git at videolan.org
Fri Sep 1 20:50:45 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Sep  1 14:44:27 2017 -0300| [9aa24699302c691459281b8f5da5484605eaf82b] | committer: James Almer

avcodec/internal: move FF_QSCALE_TYPE defines from avcodec.h

Their use in the public header is deprecated and will be removed, but
they are still needed by some codecs at least as long as qscale related
deprecated fields in the AVFrame struct remain in the tree.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9aa24699302c691459281b8f5da5484605eaf82b
---

 libavcodec/internal.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 64120ea92a..e5824cc62d 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -76,6 +76,13 @@
 #define FF_DEFAULT_QUANT_BIAS 999999
 #endif
 
+#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
+
 #define FF_SANE_NB_CHANNELS 64U
 
 #define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)



More information about the ffmpeg-cvslog mailing list