ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Oct 23 15:59:02 2017 -0300| [f7eb1c9ac55bd27583419fb09c3dbb70b3ce56bc] | committer: James Almer
Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db' * commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db': lavc: Drop deprecated macroblock type symbols Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7eb1c9ac55bd27583419fb09c3dbb70b3ce56bc --- libavcodec/avcodec.h | 26 -------------------------- libavcodec/mpegutils.h | 2 -- libavcodec/version.h | 3 --- 3 files changed, 31 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 62775edb76..5a07aad5a9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1247,32 +1247,6 @@ typedef struct RcOverride{ #define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 #endif /* FF_API_WITHOUT_PREFIX */ -#if FF_API_MB_TYPE -//The following defines may change, don't expect compatibility if you use them. -#define MB_TYPE_INTRA4x4 0x0001 -#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific -#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific -#define MB_TYPE_16x16 0x0008 -#define MB_TYPE_16x8 0x0010 -#define MB_TYPE_8x16 0x0020 -#define MB_TYPE_8x8 0x0040 -#define MB_TYPE_INTERLACED 0x0080 -#define MB_TYPE_DIRECT2 0x0100 //FIXME -#define MB_TYPE_ACPRED 0x0200 -#define MB_TYPE_GMC 0x0400 -#define MB_TYPE_SKIP 0x0800 -#define MB_TYPE_P0L0 0x1000 -#define MB_TYPE_P1L0 0x2000 -#define MB_TYPE_P0L1 0x4000 -#define MB_TYPE_P1L1 0x8000 -#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) -#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) -#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) -#define MB_TYPE_QUANT 0x00010000 -#define MB_TYPE_CBP 0x00020000 -// Note bits 24-31 are reserved for codec specific use (H.264 ref0, MPEG-1 0mv, ...) -#endif - /** * Pan Scan area. * This specifies the area which should be displayed. diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 9cfadfc4cf..1bf73fea02 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -48,7 +48,6 @@ #define MAX_FCODE 7 /* MB types */ -#if !FF_API_MB_TYPE #define MB_TYPE_INTRA4x4 (1 << 0) #define MB_TYPE_INTRA16x16 (1 << 1) // FIXME H.264-specific #define MB_TYPE_INTRA_PCM (1 << 2) // FIXME H.264-specific @@ -70,7 +69,6 @@ #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) #define MB_TYPE_QUANT (1 << 16) #define MB_TYPE_CBP (1 << 17) -#endif #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type diff --git a/libavcodec/version.h b/libavcodec/version.h index 4cfc66da0b..4565cd5aac 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -57,9 +57,6 @@ #ifndef FF_API_DEBUG_MV #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_MB_TYPE -#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_EMU_EDGE #define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) #endif ====================================================================== diff --cc libavcodec/avcodec.h index 62775edb76,6fd76b5329..5a07aad5a9 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@@ -1230,49 -1069,9 +1230,23 @@@ typedef struct RcOverride /** * Audio encoder supports receiving a different number of samples in each call. */ -#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000 +#define CODEC_CAP_VARIABLE_FRAME_SIZE AV_CODEC_CAP_VARIABLE_FRAME_SIZE +/** + * Codec is intra only. + */ +#define CODEC_CAP_INTRA_ONLY AV_CODEC_CAP_INTRA_ONLY +/** + * Codec is lossless. + */ +#define CODEC_CAP_LOSSLESS AV_CODEC_CAP_LOSSLESS + +/** + * HWAccel is experimental and is thus avoided in favor of non experimental + * codecs + */ +#define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 #endif /* FF_API_WITHOUT_PREFIX */ - #if FF_API_MB_TYPE - //The following defines may change, don't expect compatibility if you use them. - #define MB_TYPE_INTRA4x4 0x0001 - #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific - #define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific - #define MB_TYPE_16x16 0x0008 - #define MB_TYPE_16x8 0x0010 - #define MB_TYPE_8x16 0x0020 - #define MB_TYPE_8x8 0x0040 - #define MB_TYPE_INTERLACED 0x0080 - #define MB_TYPE_DIRECT2 0x0100 //FIXME - #define MB_TYPE_ACPRED 0x0200 - #define MB_TYPE_GMC 0x0400 - #define MB_TYPE_SKIP 0x0800 - #define MB_TYPE_P0L0 0x1000 - #define MB_TYPE_P1L0 0x2000 - #define MB_TYPE_P0L1 0x4000 - #define MB_TYPE_P1L1 0x8000 - #define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) - #define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) - #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) - #define MB_TYPE_QUANT 0x00010000 - #define MB_TYPE_CBP 0x00020000 - // Note bits 24-31 are reserved for codec specific use (H.264 ref0, MPEG-1 0mv, ...) - #endif - /** * Pan Scan area. * This specifies the area which should be displayed. diff --cc libavcodec/version.h index 4cfc66da0b,da2d5e5328..4565cd5aac --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -45,21 -45,11 +45,18 @@@ * 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_FAST_MALLOC -#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 58) +#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_MB_TYPE - #define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) - #endif #ifndef FF_API_EMU_EDGE #define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
