[FFmpeg-cvslog] Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'
James Almer
git at videolan.org
Mon Oct 23 21:57:55 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 23 15:56:29 2017 -0300| [0b79fdeb9a81b8a568c7efea1063352338f4aa5b] | committer: James Almer
Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'
* commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c':
lavc: Drop deprecated public symbols
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b79fdeb9a81b8a568c7efea1063352338f4aa5b
---
libavcodec/avcodec.h | 23 -----------------------
libavcodec/internal.h | 2 --
libavcodec/version.h | 12 ------------
3 files changed, 37 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8b32ed7e77..62775edb76 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -844,13 +844,6 @@ typedef struct RcOverride{
float quality_factor;
} RcOverride;
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
-#define FF_MAX_B_FRAMES 16
-#endif
-
/* encoding support
These flags can be passed in AVCodecContext.flags before initialization.
Note: Not everything is supported yet.
@@ -1218,12 +1211,6 @@ typedef struct RcOverride{
* Codec should fill in channel configuration and samplerate instead of container
*/
#define CODEC_CAP_CHANNEL_CONF AV_CODEC_CAP_CHANNEL_CONF
-#if FF_API_NEG_LINESIZES
-/**
- * @deprecated no codecs use this capability
- */
-#define CODEC_CAP_NEG_LINESIZES 0x0800
-#endif
/**
* Codec supports frame-level multithreading.
*/
@@ -1353,13 +1340,6 @@ typedef struct AVCPBProperties {
uint64_t vbv_delay;
} AVCPBProperties;
-#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
-
/**
* The decoder will keep a reference to the frame and may reuse it later.
*/
@@ -3079,9 +3059,6 @@ typedef struct AVCodecContext {
#define FF_IDCT_IPP 13
#endif /* FF_API_UNUSED_MEMBERS */
#define FF_IDCT_XVID 14
-#if FF_API_IDCT_XVIDMMX
-#define FF_IDCT_XVIDMMX 14
-#endif /* FF_API_IDCT_XVIDMMX */
#define FF_IDCT_SIMPLEARMV5TE 16
#define FF_IDCT_SIMPLEARMV6 17
#define FF_IDCT_FAAN 20
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index f1d520237a..e9aad91704 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -80,12 +80,10 @@
#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
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b0a90b8d19..4cfc66da0b 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,27 +57,15 @@
#ifndef FF_API_DEBUG_MV
#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
-#ifndef FF_API_QSCALE_TYPE
-#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_MB_TYPE
#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_EMU_EDGE
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_UNUSED_MEMBERS
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
-#ifndef FF_API_IDCT_XVIDMMX
-#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_INPUT_PRESERVED
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
======================================================================
diff --cc libavcodec/avcodec.h
index 8b32ed7e77,6311acf628..62775edb76
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -1217,13 -1049,7 +1210,7 @@@ typedef struct RcOverride
/**
* Codec should fill in channel configuration and samplerate instead of container
*/
-#define CODEC_CAP_CHANNEL_CONF 0x0400
+#define CODEC_CAP_CHANNEL_CONF AV_CODEC_CAP_CHANNEL_CONF
- #if FF_API_NEG_LINESIZES
- /**
- * @deprecated no codecs use this capability
- */
- #define CODEC_CAP_NEG_LINESIZES 0x0800
- #endif
/**
* Codec supports frame-level multithreading.
*/
diff --cc libavcodec/internal.h
index f1d520237a,5b82504bfb..e9aad91704
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@@ -80,24 -77,9 +80,22 @@@
#define FF_DEFAULT_QUANT_BIAS 999999
#endif
- #if !FF_API_QSCALE_TYPE
-#define FF_SANE_NB_CHANNELS 63U
+#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_SIGNBIT(x) (x >> CHAR_BIT * sizeof(x) - 1)
+#define FF_SANE_NB_CHANNELS 64U
+
+#define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)
+
+#if HAVE_SIMD_ALIGN_32
+# define STRIDE_ALIGN 32
+#elif HAVE_SIMD_ALIGN_16
+# define STRIDE_ALIGN 16
+#else
+# define STRIDE_ALIGN 8
+#endif
typedef struct FramePool {
/**
diff --cc libavcodec/version.h
index b0a90b8d19,db14d7bf97..4cfc66da0b
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,30 -45,14 +45,21 @@@
* FF_API_* defines may be placed below to indicate public API that will be
* dropped at a future version bump. The defines themselves are not part of
* the public API and may change, break or disappear at any time.
+ *
+ * @note, when bumping the major version it is recommended to manually
+ * disable each FF_API_* in its own commit instead of disabling them all
+ * at once through the bump. This improves the git bisect-ability of the change.
*/
+#ifndef FF_API_LOWRES
+#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_DEBUG_MV
+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
+#endif
- #ifndef FF_API_QSCALE_TYPE
- #define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
#ifndef FF_API_MB_TYPE
#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
- #ifndef FF_API_MAX_BFRAMES
- #define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
- #ifndef FF_API_NEG_LINESIZES
- #define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58)
-#ifndef FF_API_FAST_MALLOC
-#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 58)
--#endif
#ifndef FF_API_EMU_EDGE
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
More information about the ffmpeg-cvslog
mailing list