Re: [libav-devel] [PATCH 01/41] Bump major versions of all libraries

[Diego Biurrun]

On Tue, Dec 06, 2016 at 12:27:22AM -0500, Vittorio Giovara wrote:
> This disable everything that was deprecated in the past 18 months,

disable_S

> --- a/libavdevice/version.h
> +++ b/libavdevice/version.h
> @@ -27,8 +27,8 @@
>  
> -#define LIBAVDEVICE_VERSION_MAJOR 56
> -#define LIBAVDEVICE_VERSION_MINOR  1
> +#define LIBAVDEVICE_VERSION_MAJOR 57
> +#define LIBAVDEVICE_VERSION_MINOR  0
>  #define LIBAVDEVICE_VERSION_MICRO  0
>  
> --- a/libavresample/version.h
> +++ b/libavresample/version.h
> @@ -27,7 +27,7 @@
>  
> -#define LIBAVRESAMPLE_VERSION_MAJOR  3
> +#define LIBAVRESAMPLE_VERSION_MAJOR  4
>  #define LIBAVRESAMPLE_VERSION_MINOR  0
>  #define LIBAVRESAMPLE_VERSION_MICRO  0
>  
> --- a/libswscale/version.h
> +++ b/libswscale/version.h
> @@ -26,7 +26,7 @@
>  
> -#define LIBSWSCALE_VERSION_MAJOR 4
> +#define LIBSWSCALE_VERSION_MAJOR 5
>  #define LIBSWSCALE_VERSION_MINOR 0
>  #define LIBSWSCALE_VERSION_MICRO 0

These bumps seem gratuitous, there are no deprecated APIs in these libraries.

Also, lots of tests currently break if you bump all version numbers because
the output of the framecrc muxer changes. That will have to be addressed.
Anton knows the exact reason and wanted to make a decision which way to
resolve this.

https://oracle.libav.org/x86_64-linux-version-bump/20161204165430

So before you push this, it has to survive Oracle.

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 34/41] lavc: Drop deprecated preserve input option

[Vittorio Giovara]

Deprecated in 04/2014.
---
 libavcodec/avcodec.h   | 7 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 0f83044..073250a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -913,13 +913,6 @@ typedef struct RcOverride{
  */
 #define CODEC_FLAG_MV00x0040
 #endif
-#if FF_API_INPUT_PRESERVED
-/**
- * @deprecated passing reference-counted frames to the encoders replaces this
- * flag
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#endif
 #define CODEC_FLAG_PASS1   0x0200   ///< Use internal 2pass 
ratecontrol in first pass mode.
 #define CODEC_FLAG_PASS2   0x0400   ///< Use internal 2pass 
ratecontrol in second pass mode.
 #define CODEC_FLAG_GRAY0x2000   ///< Only decode/encode grayscale.
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index da0a1f8..362e31c 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -56,9 +56,6 @@ static const AVOption avcodec_options[] = {
 #if FF_API_MV0
 {"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = 
CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},
 #endif
-#if FF_API_INPUT_PRESERVED
-{"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 
CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"},
-#endif
 {"pass1", "use internal 2-pass ratecontrol in first  pass mode", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"},
 {"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"},
 {"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index eefdfd1..2481ae8 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_INPUT_PRESERVED
-#define FF_API_INPUT_PRESERVED   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_NORMALIZE_AQP
 #define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 22/41] lavc: Drop deprecated xvmc hacks

[Vittorio Giovara]

Deprecated in 11/2013.
---
 configure |   2 -
 libavcodec/Makefile   |   3 -
 libavcodec/allcodecs.c|   3 -
 libavcodec/avcodec.h  |  17 ---
 libavcodec/blockdsp.c |   4 -
 libavcodec/blockdsp.h |   5 -
 libavcodec/codec_desc.c   |   9 --
 libavcodec/error_resilience.c |  20 ---
 libavcodec/mpeg12dec.c| 103 -
 libavcodec/mpegvideo.c|  27 
 libavcodec/mpegvideo_xvmc.c   | 337 --
 libavcodec/options_table.h|   3 -
 libavcodec/version.h  |   3 -
 libavcodec/x86/blockdsp.c |  13 --
 libavcodec/xvmc.h | 174 --
 libavcodec/xvmc_internal.h|  38 -
 16 files changed, 761 deletions(-)
 delete mode 100644 libavcodec/mpegvideo_xvmc.c
 delete mode 100644 libavcodec/xvmc.h
 delete mode 100644 libavcodec/xvmc_internal.h

diff --git a/configure b/configure
index 37482cf..7b8f3e5 100755
--- a/configure
+++ b/configure
@@ -2025,8 +2025,6 @@ mp3on4_decoder_select="mpegaudio"
 mp3on4float_decoder_select="mpegaudio"
 mpc7_decoder_select="bswapdsp mpegaudiodsp"
 mpc8_decoder_select="mpegaudiodsp"
-mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
-mpeg_xvmc_decoder_select="mpeg2video_decoder"
 mpeg1video_decoder_select="error_resilience mpeg_er mpegvideo"
 mpeg1video_encoder_select="aandcttables mpegvideoenc"
 mpeg2video_decoder_select="error_resilience mpeg_er mpegvideo"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0beeda4..8e77222 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -12,7 +12,6 @@ HEADERS = avcodec.h   
  \
   vdpau.h   \
   version.h \
   vorbis_parser.h   \
-  xvmc.h\
 
 OBJS = allcodecs.o  \
avpacket.o   \
@@ -328,7 +327,6 @@ OBJS-$(CONFIG_MP3ON4_DECODER)  += 
mpegaudiodec_fixed.o mpeg4audio.o
 OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += mpegaudiodec_float.o mpeg4audio.o
 OBJS-$(CONFIG_MPC7_DECODER)+= mpc7.o mpc.o
 OBJS-$(CONFIG_MPC8_DECODER)+= mpc8.o mpc.o
-OBJS-$(CONFIG_MPEG_XVMC_DECODER)   += mpegvideo_xvmc.o
 OBJS-$(CONFIG_MPEG1VIDEO_DECODER)  += mpeg12dec.o mpeg12.o mpeg12data.o
 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)  += mpeg12enc.o mpeg12.o
 OBJS-$(CONFIG_MPEG2_QSV_DECODER)   += qsvdec_other.o
@@ -777,7 +775,6 @@ SKIPHEADERS-$(CONFIG_D3D11VA)  += d3d11va.h 
dxva2_internal.h
 SKIPHEADERS-$(CONFIG_DXVA2)+= dxva2.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 SKIPHEADERS-$(CONFIG_LIBVPX)   += libvpx.h
-SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 SKIPHEADERS-$(CONFIG_NVENC)+= nvenc.h
 SKIPHEADERS-$(CONFIG_QSV)  += qsv.h qsv_internal.h
 SKIPHEADERS-$(CONFIG_QSVDEC)   += qsvdec.h
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 591fd87..ba7874e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -201,9 +201,6 @@ void avcodec_register_all(void)
 REGISTER_DECODER(MJPEGB,mjpegb);
 REGISTER_DECODER(MMVIDEO,   mmvideo);
 REGISTER_DECODER(MOTIONPIXELS,  motionpixels);
-#if FF_API_XVMC
-REGISTER_DECODER(MPEG_XVMC, mpeg_xvmc);
-#endif /* FF_API_XVMC */
 REGISTER_ENCDEC (MPEG1VIDEO,mpeg1video);
 REGISTER_ENCDEC (MPEG2VIDEO,mpeg2video);
 REGISTER_DECODER(MPEG2_MMAL,mpeg2_mmal);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 635fdd2..1bcaf81 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -196,9 +196,6 @@ enum AVCodecID {
 /* video codecs */
 AV_CODEC_ID_MPEG1VIDEO,
 AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
-AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
 AV_CODEC_ID_H261,
 AV_CODEC_ID_H263,
 AV_CODEC_ID_RV10,
@@ -986,10 +983,6 @@ typedef struct RcOverride{
  */
 #define CODEC_CAP_DR1 0x0002
 #define CODEC_CAP_TRUNCATED   0x0008
-#if FF_API_XVMC
-/* Codec can export data for HW decoding (XvMC). */
-#define CODEC_CAP_HWACCEL 0x0010
-#endif /* FF_API_XVMC */
 /**
  * Encoder or decoder requires flushing with NULL input at the end in order to
  * give the complete and correct output.
@@ -1927,16 +1920,6 @@ typedef struct AVCodecContext {
 #define SLICE_FLAG_ALLOW_FIELD0x0002 ///< allow draw_horiz_band() with 
field slices (MPEG-2 field pics)
 #define SLICE_FLAG_ALLOW_PLANE0x0004 ///< allow draw_horiz_band() with 1 
component at a time (SVQ1)
 
-#if FF_API_XVMC
-/**
- * XVideo Motion Acceleration
- * - 

[libav-devel] [PATCH 32/41] lavc: Drop deprecated unused public members

[Vittorio Giovara]

Deprecated in 07/2014.
---
 libavcodec/avcodec.h   | 18 --
 libavcodec/options_table.h | 12 
 libavcodec/version.h   |  3 ---
 3 files changed, 33 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f94a73c..c6235ad 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1993,15 +1993,6 @@ typedef struct AVCodecContext {
 int chromaoffset;
 #endif
 
-#if FF_API_UNUSED_MEMBERS
-/**
- * Multiplied by qscale for each frame and added to scene_change_score.
- * - encoding: Set by user.
- * - decoding: unused
- */
-attribute_deprecated int scenechange_factor;
-#endif
-
 /**
  * Note: Value depends upon the compare function used for fullpel ME.
  * - encoding: Set by user.
@@ -2347,9 +2338,6 @@ typedef struct AVCodecContext {
 #define FF_CODER_TYPE_AC1
 #define FF_CODER_TYPE_RAW   2
 #define FF_CODER_TYPE_RLE   3
-#if FF_API_UNUSED_MEMBERS
-#define FF_CODER_TYPE_DEFLATE   4
-#endif /* FF_API_UNUSED_MEMBERS */
 /**
  * @deprecated use encoder private options instead
  */
@@ -2543,9 +2531,6 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_DCT_COEFF   0x0040
 #define FF_DEBUG_SKIP0x0080
 #define FF_DEBUG_STARTCODE   0x0100
-#if FF_API_UNUSED_MEMBERS
-#define FF_DEBUG_PTS 0x0200
-#endif /* FF_API_UNUSED_MEMBERS */
 #define FF_DEBUG_ER  0x0400
 #define FF_DEBUG_MMCO0x0800
 #define FF_DEBUG_BUGS0x1000
@@ -2630,9 +2615,6 @@ typedef struct AVCodecContext {
 #define FF_IDCT_ARM   7
 #define FF_IDCT_ALTIVEC   8
 #define FF_IDCT_SIMPLEARM 10
-#if FF_API_UNUSED_MEMBERS
-#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
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index d48014d..2c9d25f 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -206,9 +206,6 @@ static const AVOption avcodec_options[] = {
 {"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV5TE }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
-#if FF_API_UNUSED_MEMBERS
-{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, 
V|E|D, "idct"},
-#endif /* FF_API_UNUSED_MEMBERS */
 {"xvid", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, 
V|E|D, "idct"},
 #if FF_API_IDCT_XVIDMMX
 {"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, 
INT_MAX, V|E|D, "idct"},
@@ -235,9 +232,6 @@ static const AVOption avcodec_options[] = {
 {"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, 
INT_MIN, INT_MAX, V|D, "debug"},
 {"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, 
INT_MAX, V|D, "debug"},
 {"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, 
INT_MIN, INT_MAX, V|D, "debug"},
-#if FF_API_UNUSED_MEMBERS
-{"pts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PTS }, INT_MIN, INT_MAX, 
V|D, "debug"},
-#endif /* FF_API_UNUSED_MEMBERS */
 {"er", "error recognition", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_ER }, 
INT_MIN, INT_MAX, V|D, "debug"},
 {"mmco", "memory management control operations (H.264)", 0, AV_OPT_TYPE_CONST, 
{.i64 = FF_DEBUG_MMCO }, INT_MIN, INT_MAX, V|D, "debug"},
 {"bugs", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUGS }, INT_MIN, 
INT_MAX, V|D, "debug"},
@@ -283,9 +277,6 @@ static const AVOption avcodec_options[] = {
 {"ac", "arithmetic coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_AC }, 
INT_MIN, INT_MAX, V|E, "coder"},
 {"raw", "raw (no encoding)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RAW 
}, INT_MIN, INT_MAX, V|E, "coder"},
 {"rle", "run-length coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RLE }, 
INT_MIN, INT_MAX, V|E, "coder"},
-#if FF_API_UNUSED_MEMBERS
-{"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"},
-#endif /* FF_API_UNUSED_MEMBERS */
 #endif /* FF_API_CODER_TYPE */
 #if FF_API_PRIVATE_OPT
 {"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = 
DEFAULT }, INT_MIN, INT_MAX, V|E},
@@ -373,9 +364,6 @@ static const AVOption avcodec_options[] = {
 {"chromaoffset", "chroma QP offset from luma", OFFSET(chromaoffset), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #endif
 {"trellis", "rate-distortion optimal quantization", OFFSET(trellis), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
-#if FF_API_UNUSED_MEMBERS
-{"sc_factor", "multiplied by qscale for each frame and added to 
scene_change_score", OFFSET(scenechange_factor), AV_OPT_TYPE_INT, {.i64 = 6 }, 
0, INT_MAX, V|E},
-#endif /* 

[libav-devel] [PATCH 39/41] lavu: Drop deprecated vdpau pixel formats

[Vittorio Giovara]

Deprecated in 07/2013.
---
 libavutil/pixdesc.c | 38 --
 libavutil/pixfmt.h  | 10 --
 libavutil/version.h |  3 ---
 3 files changed, 51 deletions(-)

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 2f1adf5..1e54462 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -832,44 +832,6 @@ static const AVPixFmtDescriptor 
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
 },
 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
-#if FF_API_VDPAU
-[AV_PIX_FMT_VDPAU_H264] = {
-.name = "vdpau_h264",
-.log2_chroma_w = 1,
-.log2_chroma_h = 1,
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-[AV_PIX_FMT_VDPAU_MPEG1] = {
-.name = "vdpau_mpeg1",
-.log2_chroma_w = 1,
-.log2_chroma_h = 1,
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-[AV_PIX_FMT_VDPAU_MPEG2] = {
-.name = "vdpau_mpeg2",
-.log2_chroma_w = 1,
-.log2_chroma_h = 1,
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-[AV_PIX_FMT_VDPAU_WMV3] = {
-.name = "vdpau_wmv3",
-.log2_chroma_w = 1,
-.log2_chroma_h = 1,
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-[AV_PIX_FMT_VDPAU_VC1] = {
-.name = "vdpau_vc1",
-.log2_chroma_w = 1,
-.log2_chroma_h = 1,
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-[AV_PIX_FMT_VDPAU_MPEG4] = {
-.name = "vdpau_mpeg4",
-.log2_chroma_w = 1,
-.log2_chroma_h = 1,
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-#endif
 [AV_PIX_FMT_RGB48BE] = {
 .name = "rgb48be",
 .nb_components = 3,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 41498cc..37d6624 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -96,13 +96,6 @@ enum AVPixelFormat {
 AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y 
samples)
 AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated 
in favor of AV_PIX_FMT_YUV440P and setting color_range
 AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 
2x2 Y & A samples)
-#if FF_API_VDPAU
-AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains 
a vdpau_render_state struct which contains the bitstream of the slices as well 
as various fields extracted from headers
-AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] 
contains a vdpau_render_state struct which contains the bitstream of the slices 
as well as various fields extracted from headers
-AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] 
contains a vdpau_render_state struct which contains the bitstream of the slices 
as well as various fields extracted from headers
-AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a 
vdpau_render_state struct which contains the bitstream of the slices as well as 
various fields extracted from headers
-AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a 
vdpau_render_state struct which contains the bitstream of the slices as well as 
various fields extracted from headers
-#endif
 AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 
2-byte value for each R/G/B component is stored as big-endian
 AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 
2-byte value for each R/G/B component is stored as little-endian
 
@@ -131,9 +124,6 @@ enum AVPixelFormat {
 AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample 
per 2x1 Y samples), big-endian
 AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample 
per 1x1 Y samples), little-endian
 AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample 
per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG-4 HW decoding with VDPAU, data[0] 
contains a vdpau_render_state struct which contains the bitstream of the slices 
as well as various fields extracted from headers
-#endif
 AV_PIX_FMT_DXVA2_VLD,///< HW decoding through DXVA2, Picture.data[3] 
contains a LPDIRECT3DSURFACE9 pointer
 
 AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), 
little-endian, most significant bits to 0
diff --git a/libavutil/version.h b/libavutil/version.h
index 5b4abba..6f1ffa9 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -78,9 +78,6 @@
  * @{
  */
 
-#ifndef FF_API_VDPAU
-#define FF_API_VDPAU(LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_XVMC
 #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 37/41] lavc: Drop deprecated mv0 option

[Vittorio Giovara]

Deprecated in 04/2014.
---
 libavcodec/avcodec.h   | 7 ---
 libavcodec/mpegvideo_enc.c | 7 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 4 files changed, 20 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1feed51..7375957 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -900,13 +900,6 @@ typedef struct RcOverride{
 #define CODEC_FLAG_4MV0x0004  ///< 4 MV per MB allowed / advanced 
prediction for H.263.
 #define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that 
might be corrupted
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
-#if FF_API_MV0
-/**
- * @deprecated use the flag "mv0" in the "mpv_flags" private option of the
- * mpegvideo encoders
- */
-#define CODEC_FLAG_MV00x0040
-#endif
 #define CODEC_FLAG_PASS1   0x0200   ///< Use internal 2pass 
ratecontrol in first pass mode.
 #define CODEC_FLAG_PASS2   0x0400   ///< Use internal 2pass 
ratecontrol in second pass mode.
 #define CODEC_FLAG_GRAY0x2000   ///< Only decode/encode grayscale.
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index dd6235a..ff852fc 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -894,13 +894,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 return ret;
 }
 
-#if FF_API_MV0
-FF_DISABLE_DEPRECATION_WARNINGS
-if (avctx->flags & CODEC_FLAG_MV0)
-s->mpv_flags |= FF_MPV_FLAG_MV0;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
 #if FF_API_MPV_OPT
 FF_DISABLE_DEPRECATION_WARNINGS
 if (avctx->rc_qsquish != 0.0)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 1bc91db..875aeed 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -50,9 +50,6 @@ static const AVOption avcodec_options[] = {
 {"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},
 {"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},
 {"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},
-#if FF_API_MV0
-{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = 
CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},
-#endif
 {"pass1", "use internal 2-pass ratecontrol in first  pass mode", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"},
 {"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"},
 {"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 8e3e307..2b536a7 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_MV0
-#define FF_API_MV0   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_CODEC_NAME
 #define FF_API_CODEC_NAME(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 29/41] lavc: Drop deprecated emu edge functionality

[Vittorio Giovara]

Deprecated in 01/2014.
---
 libavcodec/avcodec.h   | 22 --
 libavcodec/options_table.h |  3 ---
 libavcodec/utils.c |  7 ---
 libavcodec/version.h   |  3 ---
 4 files changed, 35 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 191454c..1b72434 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -923,13 +923,6 @@ typedef struct RcOverride{
 #define CODEC_FLAG_PASS1   0x0200   ///< Use internal 2pass 
ratecontrol in first pass mode.
 #define CODEC_FLAG_PASS2   0x0400   ///< Use internal 2pass 
ratecontrol in second pass mode.
 #define CODEC_FLAG_GRAY0x2000   ///< Only decode/encode grayscale.
-#if FF_API_EMU_EDGE
-/**
- * @deprecated edges are not used/required anymore. I.e. this flag is now 
always
- * set.
- */
-#define CODEC_FLAG_EMU_EDGE0x4000
-#endif
 #define CODEC_FLAG_PSNR0x8000   ///< error[?] variables will be 
set during encoding.
 #define CODEC_FLAG_TRUNCATED   0x0001 /** Input bitstream might be 
truncated at a random
   location instead of only at 
frame boundaries. */
@@ -3932,21 +3925,6 @@ AVCodec *avcodec_find_decoder_by_name(const char *name);
  */
 int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
 
-#if FF_API_EMU_EDGE
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- *
- * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
- * needed
- */
-attribute_deprecated
-unsigned avcodec_get_edge_width(void);
-#endif
-
 /**
  * Modify width and height values so that they will result in a memory
  * buffer that is acceptable for the codec if you do not use any horizontal
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 9c677c0..4ea7e49 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -62,9 +62,6 @@ static const AVOption avcodec_options[] = {
 {"pass1", "use internal 2-pass ratecontrol in first  pass mode", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"},
 {"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"},
 {"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"},
-#if FF_API_EMU_EDGE
-{"emu_edge", "do not draw edges", 0, AV_OPT_TYPE_CONST, {.i64 = 
CODEC_FLAG_EMU_EDGE }, INT_MIN, INT_MAX, 0, "flags"},
-#endif
 {"psnr", "error[?] variables will be set during encoding", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, 
"flags"},
 {"truncated", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_TRUNCATED }, 
INT_MIN, INT_MAX, 0, "flags"},
 #if FF_API_NORMALIZE_AQP
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index cd1bc5a..343ce50 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -117,13 +117,6 @@ av_cold void avcodec_register(AVCodec *codec)
 codec->init_static_data(codec);
 }
 
-#if FF_API_EMU_EDGE
-unsigned avcodec_get_edge_width(void)
-{
-return EDGE_WIDTH;
-}
-#endif
-
 int ff_set_dimensions(AVCodecContext *s, int width, int height)
 {
 int ret = av_image_check_size(width, height, 0, s);
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d8ca71d..2e6d61a 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_EMU_EDGE
-#define FF_API_EMU_EDGE  (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_ARCH_SH4
 #define FF_API_ARCH_SH4  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 11/41] lavc: Drop deprecated missing sample log function

[Vittorio Giovara]

Deprecated in 01/2013.
---
 libavcodec/avcodec.h | 30 --
 libavcodec/utils.c   | 29 -
 libavcodec/version.h |  3 ---
 3 files changed, 62 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c35f3aa..6ad2382 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -5204,36 +5204,6 @@ void av_fast_padded_malloc(void *ptr, unsigned int 
*size, size_t min_size);
  */
 unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
-#if FF_API_MISSING_SAMPLE
-/**
- * Log a generic warning message about a missing feature. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this 
feature.
- * If want_sample is non-zero, additional verbiage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- * @deprecated Use avpriv_report_missing_feature() instead.
- */
-attribute_deprecated
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- * @deprecated Use avpriv_request_sample() instead.
- */
-attribute_deprecated
-void av_log_ask_for_sample(void *avc, const char *msg, ...) 
av_printf_format(2, 3);
-#endif /* FF_API_MISSING_SAMPLE */
-
 /**
  * Register the hardware accelerator hwaccel.
  */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0b44bb6..be66bd3 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1331,35 +1331,6 @@ int ff_match_2uint16(const uint16_t(*tab)[2], int size, 
int a, int b)
 return i;
 }
 
-#if FF_API_MISSING_SAMPLE
-FF_DISABLE_DEPRECATION_WARNINGS
-void av_log_missing_feature(void *avc, const char *feature, int want_sample)
-{
-av_log(avc, AV_LOG_WARNING, "%s is not implemented. Update your Libav "
-"version to the newest one from Git. If the problem still "
-"occurs, it means that your file has a feature which has not "
-"been implemented.\n", feature);
-if(want_sample)
-av_log_ask_for_sample(avc, NULL);
-}
-
-void av_log_ask_for_sample(void *avc, const char *msg, ...)
-{
-va_list argument_list;
-
-va_start(argument_list, msg);
-
-if (msg)
-av_vlog(avc, AV_LOG_WARNING, msg, argument_list);
-av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample "
-"of this file to ftp://upload.libav.org/incoming/ "
-"and contact the libav-devel mailing list.\n");
-
-va_end(argument_list);
-}
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif /* FF_API_MISSING_SAMPLE */
-
 static AVHWAccel *first_hwaccel = NULL;
 
 void av_register_hwaccel(AVHWAccel *hwaccel)
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 16339e1..9c34ab9 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_MISSING_SAMPLE
-#define FF_API_MISSING_SAMPLE(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_LOWRES
 #define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 21/41] lavc: Drop deprecated alpha architecture sysmbols

[Vittorio Giovara]

Deprecated in 11/2013.
---
 libavcodec/avcodec.h   | 3 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 81de75f..635fdd2 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2722,9 +2722,6 @@ typedef struct AVCodecContext {
 #endif
 #define FF_IDCT_FAAN  20
 #define FF_IDCT_SIMPLENEON22
-#if FF_API_ARCH_ALPHA
-#define FF_IDCT_SIMPLEALPHA   23
-#endif
 
 /**
  * bits per sample/pixel from the demuxer (needed for huffyuv).
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index cf3f994..64db2a2 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -212,9 +212,6 @@ static const AVOption avcodec_options[] = {
 {"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV5TE }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
-#if FF_API_ARCH_ALPHA
-{"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
-#endif
 #if FF_API_UNUSED_MEMBERS
 {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, 
V|E|D, "idct"},
 #endif /* FF_API_UNUSED_MEMBERS */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 4776edb..2486012 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_ARCH_ALPHA
-#define FF_API_ARCH_ALPHA(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_XVMC
 #define FF_API_XVMC  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 41/41] lavu: Drop deprecated option type

[Vittorio Giovara]

Deprecated in 02/2014.
---
 libavutil/opt.h | 3 ---
 libavutil/version.h | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/libavutil/opt.h b/libavutil/opt.h
index a65c4f4..b68a396 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -263,9 +263,6 @@ typedef struct AVOption {
 int flags;
 #define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be 
set by the user for muxing or encoding
 #define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be 
set by the user for demuxing or decoding
-#if FF_API_OPT_TYPE_METADATA
-#define AV_OPT_FLAG_METADATA4   ///< some data extracted or inserted 
into the file like title, comment, ...
-#endif
 #define AV_OPT_FLAG_AUDIO_PARAM 8
 #define AV_OPT_FLAG_VIDEO_PARAM 16
 #define AV_OPT_FLAG_SUBTITLE_PARAM  32
diff --git a/libavutil/version.h b/libavutil/version.h
index 31012d7..382650b 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -78,9 +78,6 @@
  * @{
  */
 
-#ifndef FF_API_OPT_TYPE_METADATA
-#define FF_API_OPT_TYPE_METADATA(LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_DLOG
 #define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 16/41] lavc: Drop deprecated way of setting codec dimensions

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h | 8 
 libavcodec/utils.c   | 7 ---
 libavcodec/version.h | 3 ---
 3 files changed, 18 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5f6e04b..5109914 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4831,14 +4831,6 @@ enum AVPixelFormat avcodec_default_get_format(struct 
AVCodecContext *s, const en
  * @}
  */
 
-#if FF_API_SET_DIMENSIONS
-/**
- * @deprecated this function is not supposed to be used from outside of lavc
- */
-attribute_deprecated
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-#endif
-
 /**
  * Put a string representing the codec tag codec_tag in buf.
  *
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index be66bd3..cd1bc5a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -124,13 +124,6 @@ unsigned avcodec_get_edge_width(void)
 }
 #endif
 
-#if FF_API_SET_DIMENSIONS
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
-{
-ff_set_dimensions(s, width, height);
-}
-#endif
-
 int ff_set_dimensions(AVCodecContext *s, int width, int height)
 {
 int ret = av_image_check_size(width, height, 0, s);
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 76874bc..0dce2fb 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_SET_DIMENSIONS
-#define FF_API_SET_DIMENSIONS(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 38/41] lavc: Drop deprecated public codec name

[Vittorio Giovara]

Deprecated in 04/2014.
---
 libavcodec/avcodec.h | 7 ---
 libavcodec/version.h | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7375957..8bd2901 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1320,13 +1320,6 @@ typedef struct AVCodecContext {
 
 enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
 const struct AVCodec  *codec;
-#if FF_API_CODEC_NAME
-/**
- * @deprecated this field is not used for anything in libavcodec
- */
-attribute_deprecated
-char codec_name[32];
-#endif
 enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
 
 /**
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2b536a7..ba17942 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_CODEC_NAME
-#define FF_API_CODEC_NAME(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_AFD
 #define FF_API_AFD   (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 36/41] lavc: Drop deprecated gmc option

[Vittorio Giovara]

Deprecated in 04/2014.
---
 libavcodec/avcodec.h   | 6 --
 libavcodec/libxvid.c   | 6 --
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 4 files changed, 18 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 4465ae7..1feed51 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -900,12 +900,6 @@ typedef struct RcOverride{
 #define CODEC_FLAG_4MV0x0004  ///< 4 MV per MB allowed / advanced 
prediction for H.263.
 #define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that 
might be corrupted
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
-#if FF_API_GMC
-/**
- * @deprecated use the "gmc" private option of the libxvid encoder
- */
-#define CODEC_FLAG_GMC0x0020  ///< Use GMC.
-#endif
 #if FF_API_MV0
 /**
  * @deprecated use the flag "mv0" in the "mpv_flags" private option of the
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 9cbe9c1..fb7c4fb 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -448,12 +448,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 break;
 }
 
-/* Bring in VOL flags from avconv command-line */
-#if FF_API_GMC
-if (avctx->flags & CODEC_FLAG_GMC)
-x->gmc = 1;
-#endif
-
 x->vol_flags = 0;
 if (x->gmc) {
 x->vol_flags |= XVID_VOL_GMC;
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index ba3428c..1bc91db 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -50,9 +50,6 @@ static const AVOption avcodec_options[] = {
 {"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},
 {"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},
 {"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},
-#if FF_API_GMC
-{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, 
INT_MAX, V|E, "flags"},
-#endif
 #if FF_API_MV0
 {"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = 
CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},
 #endif
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 00e5918..8e3e307 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_GMC
-#define FF_API_GMC   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_MV0
 #define FF_API_MV0   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 10/41] lavc: Drop deprecated chroma subsample function

[Vittorio Giovara]

Deprecated in 11/2012.
---
 libavcodec/avcodec.h| 6 --
 libavcodec/imgconvert.c | 9 -
 libavcodec/version.h| 3 ---
 3 files changed, 18 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e75d300..c35f3aa 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4793,12 +4793,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, 
int height, int width,
  * @{
  */
 
-/**
- * @deprecated Use av_pix_fmt_get_chroma_sub_sample
- */
-
-void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat 
pix_fmt, int *h_shift, int *v_shift);
-
 /**
  * Return a value representing the fourCC code associated to the
  * pixel format pix_fmt, or 0 if no associated fourCC code can be
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 4667a4f..9c8fab5 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -33,15 +33,6 @@
 #include "libavutil/internal.h"
 #include "libavutil/imgutils.h"
 
-#if FF_API_GETCHROMA
-void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, 
int *v_shift)
-{
-const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
-*h_shift = desc->log2_chroma_w;
-*v_shift = desc->log2_chroma_h;
-}
-#endif
-
 static int is_gray(const AVPixFmtDescriptor *desc)
 {
 return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 6e11821..16339e1 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_GETCHROMA
-#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_MISSING_SAMPLE
 #define FF_API_MISSING_SAMPLE(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 24/41] lavc: Drop deprecated qscale type symbols

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h | 7 ---
 libavcodec/version.h | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3aae707..6bf1576 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1154,13 +1154,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.
  */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 068c790..3db5286 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#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
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 40/41] lavu: Drop deprecated xvmc pixel formats

[Vittorio Giovara]

Deprecated in 11/2013.
---
 libavutil/pixdesc.c | 10 --
 libavutil/pixfmt.h  |  4 
 libavutil/version.h |  3 ---
 3 files changed, 17 deletions(-)

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 1e54462..5ce6c42 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -313,16 +313,6 @@ static const AVPixFmtDescriptor 
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
 },
 .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
-#if FF_API_XVMC
-[AV_PIX_FMT_XVMC_MPEG2_MC] = {
-.name = "xvmcmc",
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-[AV_PIX_FMT_XVMC_MPEG2_IDCT] = {
-.name = "xvmcidct",
-.flags = AV_PIX_FMT_FLAG_HWACCEL,
-},
-#endif /* FF_API_XVMC */
 [AV_PIX_FMT_UYVY422] = {
 .name = "uyvy422",
 .nb_components = 3,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 37d6624..3c670fc 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -71,10 +71,6 @@ enum AVPixelFormat {
 AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), 
deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range
 AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), 
deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range
 AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), 
deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
-AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet 
passing
-AV_PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
 AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
 AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
 AV_PIX_FMT_BGR8,  ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
diff --git a/libavutil/version.h b/libavutil/version.h
index 6f1ffa9..31012d7 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -78,9 +78,6 @@
  * @{
  */
 
-#ifndef FF_API_XVMC
-#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_OPT_TYPE_METADATA
 #define FF_API_OPT_TYPE_METADATA(LIBAVUTIL_VERSION_MAJOR < 56)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 33/41] lavc: Drop deprecated xvidmmx symbols

[Vittorio Giovara]

Deprecated in 08/2014.
---
 libavcodec/avcodec.h   | 3 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c6235ad..0f83044 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2616,9 +2616,6 @@ typedef struct AVCodecContext {
 #define FF_IDCT_ALTIVEC   8
 #define FF_IDCT_SIMPLEARM 10
 #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/options_table.h b/libavcodec/options_table.h
index 2c9d25f..da0a1f8 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -207,9 +207,6 @@ static const AVOption avcodec_options[] = {
 {"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"xvid", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, 
V|E|D, "idct"},
-#if FF_API_IDCT_XVIDMMX
-{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, 
INT_MAX, V|E|D, "idct"},
-#endif /* FF_API_IDCT_XVIDMMX */
 {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
 {"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 
INT_MIN, INT_MAX},
 {"ec", "set error concealment strategy", OFFSET(error_concealment), 
AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 62cb7cb..eefdfd1 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#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
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 31/41] lavc: Drop deprecated sparc architecture symbols

[Vittorio Giovara]

Deprecated in 01/2014.
---
 libavcodec/avcodec.h | 3 ---
 libavcodec/version.h | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 69e3eec..f94a73c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2639,9 +2639,6 @@ typedef struct AVCodecContext {
 #endif /* FF_API_IDCT_XVIDMMX */
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6   17
-#if FF_API_ARCH_SPARC
-#define FF_IDCT_SIMPLEVIS 18
-#endif
 #define FF_IDCT_FAAN  20
 #define FF_IDCT_SIMPLENEON22
 
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b381f14..eadf408 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_ARCH_SPARC
-#define FF_API_ARCH_SPARC(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_UNUSED_MEMBERS
 #define FF_API_UNUSED_MEMBERS(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 20/41] lavc: Drop deprecated extended aspect ratio symbol

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h | 4 
 libavcodec/h263.h| 2 --
 libavcodec/version.h | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 16f2a7a..81de75f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1590,10 +1590,6 @@ typedef struct AVCodecContext {
  */
 int coded_width, coded_height;
 
-#if FF_API_ASPECT_EXTENDED
-#define FF_ASPECT_EXTENDED 15
-#endif
-
 /**
  * the number of pictures in a group of pictures, or 0 for intra_only
  * - encoding: Set by user.
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index 3e54204..ce697da 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -31,9 +31,7 @@
 #include "h263data.h"
 #include "rl.h"
 
-#if !FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
-#endif
 #define INT_BIT (CHAR_BIT * sizeof(int))
 
 // The defines below define the number of bits that are read at once for
diff --git a/libavcodec/version.h b/libavcodec/version.h
index e60549d..4776edb 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_ASPECT_EXTENDED
-#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_ARCH_ALPHA
 #define FF_API_ARCH_ALPHA(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 35/41] lavc: Drop deprecated normalize aqp option

[Vittorio Giovara]

Deprecated in 04/2014.
---
 libavcodec/avcodec.h   | 7 ---
 libavcodec/mpegvideo_enc.c | 7 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 4 files changed, 20 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 073250a..4465ae7 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -919,13 +919,6 @@ typedef struct RcOverride{
 #define CODEC_FLAG_PSNR0x8000   ///< error[?] variables will be 
set during encoding.
 #define CODEC_FLAG_TRUNCATED   0x0001 /** Input bitstream might be 
truncated at a random
   location instead of only at 
frame boundaries. */
-#if FF_API_NORMALIZE_AQP
-/**
- * @deprecated use the flag "naq" in the "mpv_flags" private option of the
- * mpegvideo encoders
- */
-#define CODEC_FLAG_NORMALIZE_AQP  0x0002
-#endif
 #define CODEC_FLAG_INTERLACED_DCT 0x0004 ///< Use interlaced DCT.
 #define CODEC_FLAG_LOW_DELAY  0x0008 ///< Force low delay.
 #define CODEC_FLAG_GLOBAL_HEADER  0x0040 ///< Place global headers in 
extradata instead of every keyframe.
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index cde073d..dd6235a 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -894,13 +894,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 return ret;
 }
 
-#if FF_API_NORMALIZE_AQP
-FF_DISABLE_DEPRECATION_WARNINGS
-if (avctx->flags & CODEC_FLAG_NORMALIZE_AQP)
-s->mpv_flags |= FF_MPV_FLAG_NAQ;
-FF_ENABLE_DEPRECATION_WARNINGS;
-#endif
-
 #if FF_API_MV0
 FF_DISABLE_DEPRECATION_WARNINGS
 if (avctx->flags & CODEC_FLAG_MV0)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 362e31c..ba3428c 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -61,9 +61,6 @@ static const AVOption avcodec_options[] = {
 {"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"},
 {"psnr", "error[?] variables will be set during encoding", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, 
"flags"},
 {"truncated", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_TRUNCATED }, 
INT_MIN, INT_MAX, 0, "flags"},
-#if FF_API_NORMALIZE_AQP
-{"naq", "normalize adaptive quantization", 0, AV_OPT_TYPE_CONST, {.i64 = 
CODEC_FLAG_NORMALIZE_AQP }, INT_MIN, INT_MAX, V|E, "flags"},
-#endif
 {"ildct", "use interlaced DCT", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_INTERLACED_DCT }, INT_MIN, INT_MAX, V|E, "flags"},
 {"low_delay", "force low delay", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_CODEC_FLAG_LOW_DELAY }, INT_MIN, INT_MAX, V|D|E, "flags"},
 {"global_header", "place global headers in extradata instead of every 
keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GLOBAL_HEADER }, 
INT_MIN, INT_MAX, V|A|E, "flags"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2481ae8..00e5918 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_NORMALIZE_AQP
-#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_GMC
 #define FF_API_GMC   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 19/41] lavc: Drop deprecated workaround for old msmpeg4 detection

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h   | 3 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 026758f..16f2a7a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2566,9 +2566,6 @@ typedef struct AVCodecContext {
  */
 int workaround_bugs;
 #define FF_BUG_AUTODETECT   1  ///< autodetection
-#if FF_API_OLD_MSMPEG4
-#define FF_BUG_OLD_MSMPEG4  2
-#endif
 #define FF_BUG_XVID_ILACE   4
 #define FF_BUG_UMP4 8
 #define FF_BUG_NO_PADDING   16
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 9194e85..cf3f994 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -135,9 +135,6 @@ static const AVOption avcodec_options[] = {
 {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 
INT_MIN, INT_MAX},
 {"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), 
AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"},
 {"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, 
INT_MIN, INT_MAX, V|D, "bug"},
-#if FF_API_OLD_MSMPEG4
-{"old_msmpeg4", "some old lavc-generated MSMPEG4v3 files (no autodetection)", 
0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_OLD_MSMPEG4 }, INT_MIN, INT_MAX, V|D, 
"bug"},
-#endif
 {"xvid_ilace", "Xvid interlacing bug (autodetected if FOURCC == XVIX)", 0, 
AV_OPT_TYPE_CONST, {.i64 = FF_BUG_XVID_ILACE }, INT_MIN, INT_MAX, V|D, "bug"},
 {"ump4", "(autodetected if FOURCC == UMP4)", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_BUG_UMP4 }, INT_MIN, INT_MAX, V|D, "bug"},
 {"no_padding", "padding bug (autodetected)", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_BUG_NO_PADDING }, INT_MIN, INT_MAX, V|D, "bug"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 25cb6ae..e60549d 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_OLD_MSMPEG4
-#define FF_API_OLD_MSMPEG4   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_ASPECT_EXTENDED
 #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 30/41] lavc: Drop deprecated sh4 architecture symbols

[Vittorio Giovara]

Deprecated in 01/2014.
---
 libavcodec/avcodec.h   | 3 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1b72434..69e3eec 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2629,9 +2629,6 @@ typedef struct AVCodecContext {
 #define FF_IDCT_SIMPLEMMX 3
 #define FF_IDCT_ARM   7
 #define FF_IDCT_ALTIVEC   8
-#if FF_API_ARCH_SH4
-#define FF_IDCT_SH4   9
-#endif
 #define FF_IDCT_SIMPLEARM 10
 #if FF_API_UNUSED_MEMBERS
 #define FF_IDCT_IPP   13
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4ea7e49..d48014d 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -202,9 +202,6 @@ static const AVOption avcodec_options[] = {
 {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"arm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ARM }, INT_MIN, INT_MAX, 
V|E|D, "idct"},
 {"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ALTIVEC }, INT_MIN, 
INT_MAX, V|E|D, "idct"},
-#if FF_API_ARCH_SH4
-{"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SH4 }, INT_MIN, INT_MAX, 
V|E|D, "idct"},
-#endif
 {"simplearm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARM }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV5TE }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, 
INT_MIN, INT_MAX, V|E|D, "idct"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2e6d61a..b381f14 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_ARCH_SH4
-#define FF_API_ARCH_SH4  (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_ARCH_SPARC
 #define FF_API_ARCH_SPARC(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 26/41] lavc: Drop deprecated maximum number of b-frames symbol

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h | 7 ---
 libavcodec/version.h | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 36be2f8..733ed04 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -706,13 +706,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.
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 008e0e3..855e0fc 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_FAST_MALLOC
 #define FF_API_FAST_MALLOC   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 23/41] lavc: Drop deprecated error rate option

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h   | 9 -
 libavcodec/mpegvideo_enc.c | 7 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 4 files changed, 22 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1bcaf81..3aae707 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2934,15 +2934,6 @@ typedef struct AVCodecContext {
 uint8_t *subtitle_header;
 int subtitle_header_size;
 
-#if FF_API_ERROR_RATE
-/**
- * @deprecated use the 'error_rate' private AVOption of the mpegvideo
- * encoders
- */
-attribute_deprecated
-int error_rate;
-#endif
-
 #if FF_API_VBV_DELAY
 /**
  * VBV delay coded in the last frame (in periods of a 27 MHz clock).
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 6a7c9e5..cde073d 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -894,13 +894,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 return ret;
 }
 
-#if FF_API_ERROR_RATE
-FF_DISABLE_DEPRECATION_WARNINGS
-if (avctx->error_rate)
-s->error_rate = avctx->error_rate;
-FF_ENABLE_DEPRECATION_WARNINGS;
-#endif
-
 #if FF_API_NORMALIZE_AQP
 FF_DISABLE_DEPRECATION_WARNINGS
 if (avctx->flags & CODEC_FLAG_NORMALIZE_AQP)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 2ea50a7..9c677c0 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -316,9 +316,6 @@ static const AVOption avcodec_options[] = {
 #endif
 {"rc_init_occupancy", "number of bits which should be loaded into the rc 
buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, 
UINT_MAX, V|A|E|D, "flags2"},
-#if FF_API_ERROR_RATE
-{"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 
INT_MIN, INT_MAX, V|E},
-#endif
 {"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 
INT_MAX, V|E|D, "threads"},
 {"auto", "autodetect a suitable number of threads to use", 0, 
AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
 #if FF_API_MPV_OPT
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 8eb7a02..068c790 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_ERROR_RATE
-#define FF_API_ERROR_RATE(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_QSCALE_TYPE
 #define FF_API_QSCALE_TYPE   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 05/41] lavfi: Drop deprecated filter registration

[Vittorio Giovara]

Deprecated in 04/2013.
---
 libavfilter/avfilter.c | 11 ---
 libavfilter/avfilter.h | 18 --
 libavfilter/version.h  |  3 ---
 3 files changed, 32 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 439eee4..3ae7a59 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -324,17 +324,6 @@ const AVFilter *avfilter_next(const AVFilter *prev)
 return prev ? prev->next : first_filter;
 }
 
-#if FF_API_OLD_FILTER_REGISTER
-AVFilter **av_filter_next(AVFilter **filter)
-{
-return filter ? &(*filter)->next : _filter;
-}
-
-void avfilter_uninit(void)
-{
-}
-#endif
-
 int avfilter_pad_count(const AVFilterPad *pads)
 {
 int count;
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 6537a83..96d3e31 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -430,12 +430,6 @@ int avfilter_config_links(AVFilterContext *filter);
 /** Initialize the filter system. Register all builtin filters. */
 void avfilter_register_all(void);
 
-#if FF_API_OLD_FILTER_REGISTER
-/** Uninitialize the filter system. Unregister all filters. */
-attribute_deprecated
-void avfilter_uninit(void);
-#endif
-
 /**
  * Register a filter. This is only needed if you plan to use
  * avfilter_get_by_name later to lookup the AVFilter structure by name. A
@@ -467,18 +461,6 @@ AVFilter *avfilter_get_by_name(const char *name);
  */
 const AVFilter *avfilter_next(const AVFilter *prev);
 
-#if FF_API_OLD_FILTER_REGISTER
-/**
- * If filter is NULL, returns a pointer to the first registered filter pointer,
- * if filter is non-NULL, returns the next pointer after filter.
- * If the returned pointer points to NULL, the last registered filter
- * was already reached.
- * @deprecated use avfilter_next()
- */
-attribute_deprecated
-AVFilter **av_filter_next(AVFilter **filter);
-#endif
-
 /**
  * Initialize a filter with the supplied parameters.
  *
diff --git a/libavfilter/version.h b/libavfilter/version.h
index ef2b34c..4f3da2b 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,9 +49,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_OLD_FILTER_REGISTER
-#define FF_API_OLD_FILTER_REGISTER  (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
 #ifndef FF_API_NOCONST_GET_NAME
 #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 17/41] lavc: Drop deprecated debug mv functionality

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h   | 21 -
 libavcodec/options_table.h | 13 -
 libavcodec/version.h   |  3 ---
 3 files changed, 37 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5109914..cbc7c69 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2625,12 +2625,6 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_BITSTREAM   4
 #define FF_DEBUG_MB_TYPE 8
 #define FF_DEBUG_QP  16
-#if FF_API_DEBUG_MV
-/**
- * @deprecated this option does nothing
- */
-#define FF_DEBUG_MV  32
-#endif
 #define FF_DEBUG_DCT_COEFF   0x0040
 #define FF_DEBUG_SKIP0x0080
 #define FF_DEBUG_STARTCODE   0x0100
@@ -2640,24 +2634,9 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_ER  0x0400
 #define FF_DEBUG_MMCO0x0800
 #define FF_DEBUG_BUGS0x1000
-#if FF_API_DEBUG_MV
-#define FF_DEBUG_VIS_QP  0x2000
-#define FF_DEBUG_VIS_MB_TYPE 0x4000
-#endif
 #define FF_DEBUG_BUFFERS 0x8000
 #define FF_DEBUG_THREADS 0x0001
 
-#if FF_API_DEBUG_MV
-/**
- * @deprecated this option does not have any effect
- */
-attribute_deprecated
-int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x0001 // visualize forward predicted MVs 
of P-frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x0002 // visualize forward predicted MVs 
of B-frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x0004 // visualize backward predicted MVs 
of B-frames
-#endif
-
 /**
  * Error recognition; may misdetect some more or less valid parts as 
errors.
  * - encoding: unused
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4deb223..27b2ace 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -247,9 +247,6 @@ static const AVOption avcodec_options[] = {
 {"bitstream", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BITSTREAM }, 
INT_MIN, INT_MAX, V|D, "debug"},
 {"mb_type", "macroblock (MB) type", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"},
 {"qp", "per-block quantization parameter (QP)", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_QP }, INT_MIN, INT_MAX, V|D, "debug"},
-#if FF_API_DEBUG_MV
-{"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, 
INT_MAX, V|D, "debug"},
-#endif
 {"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, 
INT_MIN, INT_MAX, V|D, "debug"},
 {"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, 
INT_MAX, V|D, "debug"},
 {"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, 
INT_MIN, INT_MAX, V|D, "debug"},
@@ -259,18 +256,8 @@ static const AVOption avcodec_options[] = {
 {"er", "error recognition", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_ER }, 
INT_MIN, INT_MAX, V|D, "debug"},
 {"mmco", "memory management control operations (H.264)", 0, AV_OPT_TYPE_CONST, 
{.i64 = FF_DEBUG_MMCO }, INT_MIN, INT_MAX, V|D, "debug"},
 {"bugs", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUGS }, INT_MIN, 
INT_MAX, V|D, "debug"},
-#if FF_API_DEBUG_MV
-{"vis_qp", "visualize quantization parameter (QP), lower QP are tinted 
greener", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_QP }, INT_MIN, INT_MAX, 
V|D, "debug"},
-{"vis_mb_type", "visualize block types", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_VIS_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"},
-#endif
 {"buffers", "picture buffer allocations", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_BUFFERS }, INT_MIN, INT_MAX, V|D, "debug"},
 {"thread_ops", "threading operations", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_THREADS }, INT_MIN, INT_MAX, V|D, "debug"},
-#if FF_API_DEBUG_MV
-{"vismv", "visualize motion vectors (MVs)", OFFSET(debug_mv), AV_OPT_TYPE_INT, 
{.i64 = DEFAULT }, 0, INT_MAX, V|D, "debug_mv"},
-{"pf", "forward predicted MVs of P-frames", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_VIS_MV_P_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"},
-{"bf", "forward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_VIS_MV_B_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"},
-{"bb", "backward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_DEBUG_VIS_MV_B_BACK }, INT_MIN, INT_MAX, V|D, "debug_mv"},
-#endif
 {"cmp", "full-pel ME compare function", OFFSET(me_cmp), AV_OPT_TYPE_INT, {.i64 
= DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"subcmp", "sub-pel ME compare function", OFFSET(me_sub_cmp), AV_OPT_TYPE_INT, 
{.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"mbcmp", "macroblock compare function", OFFSET(mb_cmp), AV_OPT_TYPE_INT, 
{.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0dce2fb..42948ea 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_DEBUG_MV
-#define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_AC_VLC
 #define 

[libav-devel] [PATCH 00/41] Post release version bump

[Vittorio Giovara]

Hello,
as per tradition, now that we released major version of Libav, it is
time to look back and delete any deprecated API memeber that is unused.
This will simplify the code in many places and will fullfill our promise
to maintainers to keep the code lean and without cruft.

Contrary to previous years the version bump(s) will happen first and the
removal of disabled code will follow. This is done so that the ABI break
happens atomically and so that it's not possible for downstreams to use
(or incorrectly tag) any particular commit hash while removal takes place.

As we announced that deprecation schedule would speed up a little before
reaching the one-year period, the cutoff date is roughly set to mid 2014,
meaning that anything older than 18 months will be deleted from the codebase.

Apologies for the size of the set, there are a couple of places where
patches could be squashed, but for the sake of review I prepared a separate
patch for each API removed.

Regards,
Vittorio

Vittorio Giovara (41):
  Bump major versions of all libraries
  lavfi: Drop deprecated way of passing options for a few filters
  lavfi: Drop deprecated functions to open a filter or a filterchain
  lavfi: Drop deprecated filter initialization
  lavfi: Drop deprecated filter registration
  lavfi: Drop deprecated non-const filter retrieval
  lavf: Drop deprecated bitexact functionality
  lavf: Drop deprecated AVFract type and related field
  lavf: Drop deprecated hint to set muxer timebase
  lavc: Drop deprecated chroma subsample function
  lavc: Drop deprecated missing sample log function
  lavc: Drop deprecated lowres option
  lavc: Drop deprecated vdpau codec capability
  lavc: Drop deprecated vdpau buffer fields
  lavc: Drop deprecated voxware codec entry
  lavc: Drop deprecated way of setting codec dimensions
  lavc: Drop deprecated debug mv functionality
  lavc: Drop deprecated workaround for illegal ac_vlc
  lavc: Drop deprecated workaround for old msmpeg4 detection
  lavc: Drop deprecated extended aspect ratio symbol
  lavc: Drop deprecated alpha architecture sysmbols
  lavc: Drop deprecated xvmc hacks
  lavc: Drop deprecated error rate option
  lavc: Drop deprecated qscale type symbols
  lavc: Drop deprecated macroblock type symbols
  lavc: Drop deprecated maximum number of b-frames symbol
  lavc: Drop deprecated av_fast_malloc() compatibility
  lavc: Drop deprecated negative linesizes symbol
  lavc: Drop deprecated emu edge functionality
  lavc: Drop deprecated sh4 architecture symbols
  lavc: Drop deprecated sparc architecture symbols
  lavc: Drop deprecated unused public members
  lavc: Drop deprecated xvidmmx symbols
  lavc: Drop deprecated preserve input option
  lavc: Drop deprecated normalize aqp option
  lavc: Drop deprecated gmc option
  lavc: Drop deprecated mv0 option
  lavc: Drop deprecated public codec name
  lavu: Drop deprecated vdpau pixel formats
  lavu: Drop deprecated xvmc pixel formats
  lavu: Drop deprecated option type

 configure |   2 -
 libavcodec/Makefile   |   3 -
 libavcodec/allcodecs.c|   3 -
 libavcodec/avcodec.h  | 261 
 libavcodec/blockdsp.c |   4 -
 libavcodec/blockdsp.h |   5 -
 libavcodec/codec_desc.c   |  18 ---
 libavcodec/error_resilience.c |  20 ---
 libavcodec/h263.h |   2 -
 libavcodec/imgconvert.c   |   9 --
 libavcodec/libxvid.c  |   6 -
 libavcodec/mpeg12dec.c| 103 -
 libavcodec/mpegutils.h|   2 -
 libavcodec/mpegvideo.c|  27 
 libavcodec/mpegvideo_enc.c|  21 ---
 libavcodec/mpegvideo_xvmc.c   | 337 --
 libavcodec/options_table.h|  61 
 libavcodec/utils.c|  43 --
 libavcodec/vdpau.h|  78 --
 libavcodec/version.h  |  97 +---
 libavcodec/x86/blockdsp.c |  13 --
 libavcodec/xvmc.h | 174 --
 libavcodec/xvmc_internal.h|  38 -
 libavdevice/version.h |   4 +-
 libavfilter/af_channelmap.c   |   7 -
 libavfilter/af_join.c |   8 -
 libavfilter/avfilter.c| 107 +-
 libavfilter/avfilter.h|  68 +
 libavfilter/avfiltergraph.c   |  17 ---
 libavfilter/buffersrc.c   |   8 -
 libavfilter/version.h |  19 +--
 libavfilter/vf_aspect.c   |  46 --
 libavformat/avformat.h|  21 ---
 libavformat/mux.c |  18 ---
 libavformat/version.h |  20 +--
 libavresample/version.h   |   2 +-
 libavutil/opt.h   |   3 -
 libavutil/pixdesc.c   |  48 --
 libavutil/pixfmt.h|  14 --
 libavutil/version.h   |  23 +--
 libswscale/version.h  |   2 +-
 41 files changed, 26 insertions(+), 1736 deletions(-)
 delete mode 100644 libavcodec/mpegvideo_xvmc.c
 delete mode 100644 libavcodec/xvmc.h
 delete mode 100644 libavcodec/xvmc_internal.h

-- 
2.10.0

[libav-devel] [PATCH 15/41] lavc: Drop deprecated voxware codec entry

[Vittorio Giovara]

Deprecated in 08/2013.
---
 libavcodec/avcodec.h| 3 ---
 libavcodec/codec_desc.c | 9 -
 libavcodec/version.h| 3 ---
 3 files changed, 15 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 561323c..5f6e04b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -507,9 +507,6 @@ enum AVCodecID {
 AV_CODEC_ID_MLP,
 AV_CODEC_ID_GSM_MS, /* as found in WAV */
 AV_CODEC_ID_ATRAC3,
-#if FF_API_VOXWARE
-AV_CODEC_ID_VOXWARE,
-#endif
 AV_CODEC_ID_APE,
 AV_CODEC_ID_NELLYMOSER,
 AV_CODEC_ID_MUSEPACK8,
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 18568c9..fad4914 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2147,15 +2147,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
 .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic 
Coding 3)"),
 .props = AV_CODEC_PROP_LOSSY,
 },
-#if FF_API_VOXWARE
-{
-.id= AV_CODEC_ID_VOXWARE,
-.type  = AVMEDIA_TYPE_AUDIO,
-.name  = "voxware",
-.long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"),
-.props = AV_CODEC_PROP_LOSSY,
-},
-#endif
 {
 .id= AV_CODEC_ID_APE,
 .type  = AVMEDIA_TYPE_AUDIO,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 414e4b3..76874bc 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_VOXWARE
-#define FF_API_VOXWARE   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_SET_DIMENSIONS
 #define FF_API_SET_DIMENSIONS(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 12/41] lavc: Drop deprecated lowres option

[Vittorio Giovara]

Deprecated in 04/2013.
---
 libavcodec/avcodec.h | 14 --
 libavcodec/version.h |  3 ---
 2 files changed, 17 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6ad2382..ab848a5 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2780,17 +2780,6 @@ typedef struct AVCodecContext {
  */
 int bits_per_raw_sample;
 
-#if FF_API_LOWRES
-/**
- * low resolution decoding, 1-> 1/2 size, 2->1/4 size
- * - encoding: unused
- * - decoding: Set by user.
- *
- * @deprecated use decoder private options instead
- */
-attribute_deprecated int lowres;
-#endif
-
 #if FF_API_CODED_FRAME
 /**
  * the picture in the bitstream
@@ -3148,9 +3137,6 @@ typedef struct AVCodec {
 const int *supported_samplerates;   ///< array of supported audio 
samplerates, or NULL if unknown, array is terminated by 0
 const enum AVSampleFormat *sample_fmts; ///< array of supported sample 
formats, or NULL if unknown, array is terminated by -1
 const uint64_t *channel_layouts; ///< array of support channel 
layouts, or NULL if unknown. array is terminated by 0
-#if FF_API_LOWRES
-attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres 
supported by the decoder
-#endif
 const AVClass *priv_class;  ///< AVClass for the private 
context
 const AVProfile *profiles;  ///< array of recognized profiles, 
or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
 
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 9c34ab9..1632b8a 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_LOWRES
-#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_CAP_VDPAU
 #define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 13/41] lavc: Drop deprecated vdpau codec capability

[Vittorio Giovara]

Deprecated in 07/2013.
---
 libavcodec/avcodec.h |  6 --
 libavcodec/vdpau.h   | 34 --
 libavcodec/version.h |  3 ---
 3 files changed, 43 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ab848a5..561323c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1022,12 +1022,6 @@ typedef struct RcOverride{
  * This can be used to prevent truncation of the last audio samples.
  */
 #define CODEC_CAP_SMALL_LAST_FRAME 0x0040
-#if FF_API_CAP_VDPAU
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU0x0080
-#endif
 /**
  * Codec can output multiple frames per AVPacket
  * Normally demuxers return one frame at a time, demuxers which do not do
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 967c728..67f53a5 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -195,40 +195,6 @@ attribute_deprecated
 int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
 #endif
 
-#if FF_API_CAP_VDPAU
-/** @brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * @brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * @brief This structure is used as a callback between the Libav
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the Libav decoder and its clients.
- */
-struct vdpau_render_state {
-VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-int state; ///< Holds FF_VDPAU_STATE_* values.
-
-/** picture parameter information for all supported codecs */
-union AVVDPAUPictureInfo info;
-
-/** Describe size/location of the compressed video data.
-Set to 0 when freeing bitstream_buffers. */
-int bitstream_buffers_allocated;
-int bitstream_buffers_used;
-/** The user is responsible for freeing this buffer using av_freep(). */
-VdpBitstreamBuffer *bitstream_buffers;
-};
-#endif
-
 /* @}*/
 
 #endif /* AVCODEC_VDPAU_H */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 1632b8a..0b8161c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_BUFS_VDPAU
 #define FF_API_BUFS_VDPAU(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 18/41] lavc: Drop deprecated workaround for illegal ac_vlc

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h   | 3 ---
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index cbc7c69..026758f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2573,9 +2573,6 @@ typedef struct AVCodecContext {
 #define FF_BUG_UMP4 8
 #define FF_BUG_NO_PADDING   16
 #define FF_BUG_AMV  32
-#if FF_API_AC_VLC
-#define FF_BUG_AC_VLC   0  ///< Will be removed, libavcodec can now 
handle these non-compliant files by default.
-#endif
 #define FF_BUG_QPEL_CHROMA  64
 #define FF_BUG_STD_QPEL 128
 #define FF_BUG_QPEL_CHROMA2 256
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 27b2ace..9194e85 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -142,9 +142,6 @@ static const AVOption avcodec_options[] = {
 {"ump4", "(autodetected if FOURCC == UMP4)", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_BUG_UMP4 }, INT_MIN, INT_MAX, V|D, "bug"},
 {"no_padding", "padding bug (autodetected)", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_BUG_NO_PADDING }, INT_MIN, INT_MAX, V|D, "bug"},
 {"amv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AMV }, INT_MIN, INT_MAX, 
V|D, "bug"},
-#if FF_API_AC_VLC
-{"ac_vlc", "illegal VLC bug (autodetected per FOURCC)", 0, AV_OPT_TYPE_CONST, 
{.i64 = FF_BUG_AC_VLC }, INT_MIN, INT_MAX, V|D, "bug"},
-#endif
 {"qpel_chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA }, 
INT_MIN, INT_MAX, V|D, "bug"},
 {"std_qpel", "old standard qpel (autodetected per FOURCC/version)", 0, 
AV_OPT_TYPE_CONST, {.i64 = FF_BUG_STD_QPEL }, INT_MIN, INT_MAX, V|D, "bug"},
 {"qpel_chroma2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA2 }, 
INT_MIN, INT_MAX, V|D, "bug"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 42948ea..25cb6ae 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_AC_VLC
-#define FF_API_AC_VLC(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_OLD_MSMPEG4
 #define FF_API_OLD_MSMPEG4   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 28/41] lavc: Drop deprecated negative linesizes symbol

[Vittorio Giovara]

Deprecated in 11/2013.
---
 libavcodec/avcodec.h | 6 --
 libavcodec/version.h | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 4357422..191454c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1021,12 +1021,6 @@ typedef struct RcOverride{
  * Codec should fill in channel configuration and samplerate instead of 
container
  */
 #define CODEC_CAP_CHANNEL_CONF 0x0400
-#if FF_API_NEG_LINESIZES
-/**
- * @deprecated no codecs use this capability
- */
-#define CODEC_CAP_NEG_LINESIZES0x0800
-#endif
 /**
  * Codec supports frame-level multithreading.
  */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d54012c..d8ca71d 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#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
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 25/41] lavc: Drop deprecated macroblock type symbols

[Vittorio Giovara]

Deprecated in 10/2013.
---
 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 6bf1576..36be2f8 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1061,32 +1061,6 @@ typedef struct RcOverride{
 #define CODEC_CAP_VARIABLE_FRAME_SIZE 0x1
 #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_8x80x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT20x0100 //FIXME
-#define MB_TYPE_ACPRED 0x0200
-#define MB_TYPE_GMC0x0400
-#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  0x0001
-#define MB_TYPE_CBP0x0002
-// 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 60f9712..960999c 100644
--- a/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@ -48,7 +48,6 @@
 #define MAX_FCODE7
 
 /* 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_INTRAMB_TYPE_INTRA4x4 // default mb_type if there is just 
one type
 
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3db5286..008e0e3 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#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
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 27/41] lavc: Drop deprecated av_fast_malloc() compatibility

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavcodec/avcodec.h | 5 -
 libavcodec/version.h | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 733ed04..4357422 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -41,11 +41,6 @@
 
 #include "version.h"
 
-#if FF_API_FAST_MALLOC
-// to provide fast_*alloc
-#include "libavutil/mem.h"
-#endif
-
 /**
  * @defgroup libavc Encoding/Decoding Library
  * @{
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 855e0fc..d54012c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_FAST_MALLOC
-#define FF_API_FAST_MALLOC   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_NEG_LINESIZES
 #define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 14/41] lavc: Drop deprecated vdpau buffer fields

[Vittorio Giovara]

Deprecated in 07/2013.
---
 libavcodec/vdpau.h   | 44 
 libavcodec/version.h |  3 ---
 2 files changed, 47 deletions(-)

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 67f53a5..c446d6f 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -57,15 +57,6 @@
 #include "avcodec.h"
 #include "version.h"
 
-#if FF_API_BUFS_VDPAU
-union AVVDPAUPictureInfo {
-VdpPictureInfoH264h264;
-VdpPictureInfoMPEG1Or2mpeg;
-VdpPictureInfoVC1  vc1;
-VdpPictureInfoMPEG4Part2 mpeg4;
-};
-#endif
-
 /**
  * This structure is used to share data between the libavcodec library and
  * the client video application.
@@ -93,41 +84,6 @@ typedef struct AVVDPAUContext {
  * Set by the user.
  */
 VdpDecoderRender *render;
-
-#if FF_API_BUFS_VDPAU
-/**
- * VDPAU picture information
- *
- * Set by libavcodec.
- */
-attribute_deprecated
-union AVVDPAUPictureInfo info;
-
-/**
- * Allocated size of the bitstream_buffers table.
- *
- * Set by libavcodec.
- */
-attribute_deprecated
-int bitstream_buffers_allocated;
-
-/**
- * Useful bitstream buffers in the bitstream buffers table.
- *
- * Set by libavcodec.
- */
-attribute_deprecated
-int bitstream_buffers_used;
-
-   /**
- * Table of bitstream buffers.
- * The user is responsible for freeing this buffer using av_freep().
- *
- * Set by libavcodec.
- */
-attribute_deprecated
-VdpBitstreamBuffer *bitstream_buffers;
-#endif
 } AVVDPAUContext;
 
 /**
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0b8161c..414e4b3 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_VOXWARE
 #define FF_API_VOXWARE   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 04/41] lavfi: Drop deprecated filter initialization

[Vittorio Giovara]

Deprecated in 03/2013.
---
 libavfilter/avfilter.c |  7 ---
 libavfilter/avfilter.h | 15 ---
 libavfilter/version.h  |  3 ---
 3 files changed, 25 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d6bddef..439eee4 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -561,13 +561,6 @@ static int process_unnamed_options(AVFilterContext *ctx, 
AVDictionary **options,
 return 0;
 }
 
-#if FF_API_AVFILTER_INIT_FILTER
-int avfilter_init_filter(AVFilterContext *filter, const char *args, void 
*opaque)
-{
-return avfilter_init_str(filter, args);
-}
-#endif
-
 int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
 {
 int ret = 0;
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index babcec6..6537a83 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -479,21 +479,6 @@ attribute_deprecated
 AVFilter **av_filter_next(AVFilter **filter);
 #endif
 
-#if FF_API_AVFILTER_INIT_FILTER
-/**
- * Initialize a filter.
- *
- * @param filter the filter to initialize
- * @param args   A string of parameters to use when initializing the filter.
- *   The format and meaning of this string varies by filter.
- * @param opaque Any extra non-string data needed by the filter. The meaning
- *   of this parameter varies by filter.
- * @return   zero on success
- */
-attribute_deprecated
-int avfilter_init_filter(AVFilterContext *filter, const char *args, void 
*opaque);
-#endif
-
 /**
  * Initialize a filter with the supplied parameters.
  *
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 540ac48..ef2b34c 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,9 +49,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_AVFILTER_INIT_FILTER
-#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
 #ifndef FF_API_OLD_FILTER_REGISTER
 #define FF_API_OLD_FILTER_REGISTER  (LIBAVFILTER_VERSION_MAJOR < 7)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 03/41] lavfi: Drop deprecated functions to open a filter or a filterchain

[Vittorio Giovara]

Deprecated in 03/2013.
---
 libavfilter/avfilter.c  |  8 
 libavfilter/avfilter.h  | 30 --
 libavfilter/avfiltergraph.c | 17 -
 libavfilter/version.h   |  3 ---
 4 files changed, 58 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d9c204e..d6bddef 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -475,14 +475,6 @@ err:
 return NULL;
 }
 
-#if FF_API_AVFILTER_OPEN
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char 
*inst_name)
-{
-*filter_ctx = ff_filter_alloc(filter, inst_name);
-return *filter_ctx ? 0 : AVERROR(ENOMEM);
-}
-#endif
-
 static void free_link(AVFilterLink *link)
 {
 if (!link)
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 568480d..babcec6 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -479,22 +479,6 @@ attribute_deprecated
 AVFilter **av_filter_next(AVFilter **filter);
 #endif
 
-#if FF_API_AVFILTER_OPEN
-/**
- * Create a filter instance.
- *
- * @param filter_ctx put here a pointer to the created filter context
- * on success, NULL on failure
- * @param filterthe filter to create an instance of
- * @param inst_name Name to give to the new instance. Can be NULL for none.
- * @return >= 0 in case of success, a negative error code otherwise
- * @deprecated use avfilter_graph_alloc_filter() instead
- */
-attribute_deprecated
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char 
*inst_name);
-#endif
-
-
 #if FF_API_AVFILTER_INIT_FILTER
 /**
  * Initialize a filter.
@@ -691,20 +675,6 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph 
*graph,
  */
 AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
 
-#if FF_API_AVFILTER_OPEN
-/**
- * Add an existing filter instance to a filter graph.
- *
- * @param graphctx  the filter graph
- * @param filter the filter to be added
- *
- * @deprecated use avfilter_graph_alloc_filter() to allocate a filter in a
- * filter graph
- */
-attribute_deprecated
-int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext 
*filter);
-#endif
-
 /**
  * Create and add a filter instance into an existing graph.
  * The filter instance is created from the filter filt and inited
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 5053e3c..58ede68 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -116,23 +116,6 @@ void avfilter_graph_free(AVFilterGraph **graph)
 av_freep(graph);
 }
 
-#if FF_API_AVFILTER_OPEN
-int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
-{
-AVFilterContext **filters = av_realloc(graph->filters,
-   sizeof(*filters) * 
(graph->nb_filters + 1));
-if (!filters)
-return AVERROR(ENOMEM);
-
-graph->filters = filters;
-graph->filters[graph->nb_filters++] = filter;
-
-filter->graph = graph;
-
-return 0;
-}
-#endif
-
 int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter 
*filt,
  const char *name, const char *args, void 
*opaque,
  AVFilterGraph *graph_ctx)
diff --git a/libavfilter/version.h b/libavfilter/version.h
index bb437ef..540ac48 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,9 +49,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_AVFILTER_OPEN
-#define FF_API_AVFILTER_OPEN(LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
 #ifndef FF_API_AVFILTER_INIT_FILTER
 #define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 7)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 01/41] Bump major versions of all libraries

[Vittorio Giovara]

This disable everything that was deprecated in the past 18 months,
with a couple of minor (but sensible) exceptions.
Postpone any API-incompatible changes until the next bump.

Signed-off-by: Vittorio Giovara 
---
 libavcodec/version.h| 10 +-
 libavdevice/version.h   |  4 ++--
 libavfilter/version.h   |  4 ++--
 libavformat/version.h   | 10 +-
 libavresample/version.h |  2 +-
 libavutil/version.h | 14 +++---
 libswscale/version.h|  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 6f58bc8..6e11821 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -27,9 +27,9 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 28
-#define LIBAVCODEC_VERSION_MICRO  4
+#define LIBAVCODEC_VERSION_MAJOR 58
+#define LIBAVCODEC_VERSION_MINOR  0
+#define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -135,10 +135,10 @@
 #define FF_API_CODEC_NAME(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
 #ifndef FF_API_AFD
-#define FF_API_AFD   (LIBAVCODEC_VERSION_MAJOR < 58)
+#define FF_API_AFD   (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
 #ifndef FF_API_AUDIOENC_DELAY
-#define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 58)
+#define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
 #ifndef FF_API_AVCTX_TIMEBASE
 #define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 59)
diff --git a/libavdevice/version.h b/libavdevice/version.h
index a529732..1bcb32c 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -27,8 +27,8 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVDEVICE_VERSION_MAJOR 56
-#define LIBAVDEVICE_VERSION_MINOR  1
+#define LIBAVDEVICE_VERSION_MAJOR 57
+#define LIBAVDEVICE_VERSION_MINOR  0
 #define LIBAVDEVICE_VERSION_MICRO  0
 
 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 596701f..9a0a2c90 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -29,8 +29,8 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVFILTER_VERSION_MAJOR  6
-#define LIBAVFILTER_VERSION_MINOR  8
+#define LIBAVFILTER_VERSION_MAJOR  7
+#define LIBAVFILTER_VERSION_MINOR  0
 #define LIBAVFILTER_VERSION_MICRO  0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavformat/version.h b/libavformat/version.h
index c6085f8..7103b5d 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -29,8 +29,8 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVFORMAT_VERSION_MAJOR 57
-#define LIBAVFORMAT_VERSION_MINOR 10
+#define LIBAVFORMAT_VERSION_MAJOR 58
+#define LIBAVFORMAT_VERSION_MINOR  0
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@@ -58,13 +58,13 @@
 #define FF_API_LAVF_CODEC_TB(LIBAVFORMAT_VERSION_MAJOR < 58)
 #endif
 #ifndef FF_API_LAVF_FMT_RAWPICTURE
-#define FF_API_LAVF_FMT_RAWPICTURE  (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_LAVF_FMT_RAWPICTURE  (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
 #ifndef FF_API_COMPUTE_PKT_FIELDS2
-#define FF_API_COMPUTE_PKT_FIELDS2  (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_COMPUTE_PKT_FIELDS2  (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
 #ifndef FF_API_LAVF_AVCTX
-#define FF_API_LAVF_AVCTX   (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_LAVF_AVCTX   (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
 
 #endif /* AVFORMAT_VERSION_H */
diff --git a/libavresample/version.h b/libavresample/version.h
index 2f204e0..a6a5d67 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -27,7 +27,7 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVRESAMPLE_VERSION_MAJOR  3
+#define LIBAVRESAMPLE_VERSION_MAJOR  4
 #define LIBAVRESAMPLE_VERSION_MINOR  0
 #define LIBAVRESAMPLE_VERSION_MICRO  0
 
diff --git a/libavutil/version.h b/libavutil/version.h
index f110231..5b4abba 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -53,8 +53,8 @@
  * @{
  */
 
-#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 29
+#define LIBAVUTIL_VERSION_MAJOR 56
+#define LIBAVUTIL_VERSION_MINOR  0
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -91,19 +91,19 @@
 #define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_CRYPTO_CONTEXT
-#define FF_API_CRYPTO_CONTEXT   (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_CRYPTO_CONTEXT   (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
 #ifndef FF_API_PLUS1_MINUS1
-#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_PLUS1_MINUS1 

[libav-devel] [PATCH 09/41] lavf: Drop deprecated hint to set muxer timebase

[Vittorio Giovara]

Deprecated in 05/2014.
---
 libavformat/mux.c | 11 ---
 libavformat/version.h |  4 +---
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 1ec69b9..07a0d18 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -110,17 +110,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary 
**options)
 st  = s->streams[i];
 par = st->codecpar;
 
-#if FF_API_LAVF_CODEC_TB && FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
-if (!st->time_base.num && st->codec->time_base.num) {
-av_log(s, AV_LOG_WARNING, "Using AVStream.codec.time_base as a "
-   "timebase hint to the muxer is deprecated. Set "
-   "AVStream.time_base instead.\n");
-avpriv_set_pts_info(st, 64, st->codec->time_base.num, 
st->codec->time_base.den);
-}
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
 #if FF_API_LAVF_AVCTX
 FF_DISABLE_DEPRECATION_WARNINGS
 if (st->codecpar->codec_type == AVMEDIA_TYPE_UNKNOWN &&
diff --git a/libavformat/version.h b/libavformat/version.h
index dad38d1..7060375 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -48,9 +48,7 @@
  * 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.
  */
-#ifndef FF_API_LAVF_CODEC_TB
-#define FF_API_LAVF_CODEC_TB(LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
+
 #ifndef FF_API_LAVF_FMT_RAWPICTURE
 #define FF_API_LAVF_FMT_RAWPICTURE  (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 02/41] lavfi: Drop deprecated way of passing options for a few filters

[Vittorio Giovara]

Deprecated in 02/2013.
---
 libavfilter/af_channelmap.c |  7 -
 libavfilter/af_join.c   |  8 -
 libavfilter/avfilter.c  | 76 -
 libavfilter/buffersrc.c |  8 -
 libavfilter/version.h   |  3 --
 libavfilter/vf_aspect.c | 46 ---
 6 files changed, 148 deletions(-)

diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 5725498..e214bdb 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -150,13 +150,6 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
 else
 mode = MAP_PAIR_STR_STR;
 }
-#if FF_API_OLD_FILTER_OPTS
-if (strchr(mapping, ',')) {
-av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use "
-   "'|' to separate the mappings.\n");
-separator = ',';
-}
-#endif
 }
 
 if (mode != MAP_NONE) {
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 4d86c8b..b61033f 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -104,14 +104,6 @@ static int parse_maps(AVFilterContext *ctx)
 char separator = '|';
 char *cur  = s->map;
 
-#if FF_API_OLD_FILTER_OPTS
-if (cur && strchr(cur, ',')) {
-av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use '|' to "
-   "separate the mappings.\n");
-separator = ',';
-}
-#endif
-
 while (cur && *cur) {
 char *sep, *next, *p;
 uint64_t in_channel = 0, out_channel = 0;
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 99531e5..d9c204e 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -624,87 +624,11 @@ int avfilter_init_str(AVFilterContext *filter, const char 
*args)
 return AVERROR(EINVAL);
 }
 
-#if FF_API_OLD_FILTER_OPTS
-if (!strcmp(filter->filter->name, "scale") &&
-strchr(args, ':') && strchr(args, ':') < strchr(args, '=')) {
-/* old w:h:flags= syntax */
-char *copy = av_strdup(args);
-char *p;
-
-av_log(filter, AV_LOG_WARNING, "The ::flags= option "
-   "syntax is deprecated. Use either :: or "
-   "w=:h=:flags=.\n");
-
-if (!copy) {
-ret = AVERROR(ENOMEM);
-goto fail;
-}
-
-p = strrchr(copy, ':');
-if (p) {
-*p++ = 0;
-ret = av_dict_parse_string(, p, "=", ":", 0);
-}
-if (ret >= 0)
-ret = process_unnamed_options(filter, , copy);
-av_freep();
-
-if (ret < 0)
-goto fail;
-} else
-#endif
-
 if (strchr(args, '=')) {
 /* assume a list of key1=value1:key2=value2:... */
 ret = av_dict_parse_string(, args, "=", ":", 0);
 if (ret < 0)
 goto fail;
-#if FF_API_OLD_FILTER_OPTS
-} else if (!strcmp(filter->filter->name, "format") ||
-   !strcmp(filter->filter->name, "noformat")   ||
-   !strcmp(filter->filter->name, "frei0r") ||
-   !strcmp(filter->filter->name, "frei0r_src") ||
-   !strcmp(filter->filter->name, "ocv")) {
-/* a hack for compatibility with the old syntax
- * replace colons with |s */
-char *copy = av_strdup(args);
-char *p= copy;
-int nb_leading = 0; // number of leading colons to skip
-
-if (!copy) {
-ret = AVERROR(ENOMEM);
-goto fail;
-}
-
-if (!strcmp(filter->filter->name, "frei0r") ||
-!strcmp(filter->filter->name, "ocv"))
-nb_leading = 1;
-else if (!strcmp(filter->filter->name, "frei0r_src"))
-nb_leading = 3;
-
-while (nb_leading--) {
-p = strchr(p, ':');
-if (!p) {
-p = copy + strlen(copy);
-break;
-}
-p++;
-}
-
-if (strchr(p, ':')) {
-av_log(filter, AV_LOG_WARNING, "This syntax is deprecated. Use 
"
-   "'|' to separate the list items.\n");
-}
-
-while ((p = strchr(p, ':')))
-*p++ = '|';
-
-ret = process_unnamed_options(filter, , copy);
-av_freep();
-
-if (ret < 0)
-goto fail;
-#endif
 } else {
 ret = process_unnamed_options(filter, , args);
 if (ret < 0)
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index f553508..df00971 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -244,14 +244,6 @@ static const AVOption video_options[] = {
 { "width", NULL, OFFSET(w),

[libav-devel] [PATCH 06/41] lavfi: Drop deprecated non-const filter retrieval

[Vittorio Giovara]

Deprecated in 10/2013.
---
 libavfilter/avfilter.c | 5 +
 libavfilter/avfilter.h | 5 +
 libavfilter/version.h  | 3 ---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 3ae7a59..83c1a7c 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -292,10 +292,7 @@ int ff_poll_frame(AVFilterLink *link)
 
 static AVFilter *first_filter;
 
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
-AVFilter *avfilter_get_by_name(const char *name)
+const AVFilter *avfilter_get_by_name(const char *name)
 {
 const AVFilter *f = NULL;
 
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 96d3e31..6df69db 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -449,10 +449,7 @@ int avfilter_register(AVFilter *filter);
  * @return the filter definition, if any matching one is registered.
  * NULL if none found.
  */
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
-AVFilter *avfilter_get_by_name(const char *name);
+const AVFilter *avfilter_get_by_name(const char *name);
 
 /**
  * Iterate over all registered filters.
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 4f3da2b..ea48c16 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,8 +49,5 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_NOCONST_GET_NAME
-#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
 
 #endif /* AVFILTER_VERSION_H */
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 08/41] lavf: Drop deprecated AVFract type and related field

[Vittorio Giovara]

Deprecated in 05/2014.
---
 libavformat/avformat.h | 21 -
 libavformat/version.h  |  3 ---
 2 files changed, 24 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 547b88b..1bf66b1 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -374,19 +374,6 @@ int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
  */
 int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
 
-#if FF_API_LAVF_FRAC
-/*/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-int64_t val, num, den;
-} AVFrac;
-#endif
-
 /*/
 /* input/output formats */
 
@@ -713,14 +700,6 @@ typedef struct AVStream {
 #endif
 void *priv_data;
 
-#if FF_API_LAVF_FRAC
-/**
- * @deprecated this field is unused
- */
-attribute_deprecated
-struct AVFrac pts;
-#endif
-
 /**
  * This is the fundamental unit of time (in seconds) in terms
  * of which frame timestamps are represented.
diff --git a/libavformat/version.h b/libavformat/version.h
index 26f5c75..dad38d1 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -48,9 +48,6 @@
  * 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.
  */
-#ifndef FF_API_LAVF_FRAC
-#define FF_API_LAVF_FRAC(LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_LAVF_CODEC_TB
 #define FF_API_LAVF_CODEC_TB(LIBAVFORMAT_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 07/41] lavf: Drop deprecated bitexact functionality

[Vittorio Giovara]

Deprecated in 05/2014.
---
 libavformat/mux.c | 7 ---
 libavformat/version.h | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 37c4541..1ec69b9 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -99,13 +99,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary 
**options)
 if ((ret = av_opt_set_dict(s, )) < 0)
 goto fail;
 
-#if FF_API_LAVF_BITEXACT && FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
-if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT)
-s->flags |= AVFMT_FLAG_BITEXACT;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
 // some sanity checks
 if (s->nb_streams == 0 && !(of->flags & AVFMT_NOSTREAMS)) {
 av_log(s, AV_LOG_ERROR, "no streams\n");
diff --git a/libavformat/version.h b/libavformat/version.h
index 7103b5d..26f5c75 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -48,9 +48,6 @@
  * 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.
  */
-#ifndef FF_API_LAVF_BITEXACT
-#define FF_API_LAVF_BITEXACT(LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_LAVF_FRAC
 #define FF_API_LAVF_FRAC(LIBAVFORMAT_VERSION_MAJOR < 58)
 #endif
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] avio: Keep track of the amount of data written

[Luca Barbato]

Make avio_size() work with any write AVIOContext.
---
 libavformat/avio.h|  1 +
 libavformat/aviobuf.c | 13 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 49721aa..7bf7985 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -176,6 +176,7 @@ typedef struct AVIOContext {
  */
 enum AVIODataMarkerType current_type;
 int64_t last_time;
+int64_t written;
 } AVIOContext;
 
 /**
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 5cb733d..6d83a96 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -168,18 +168,22 @@ AVIOContext *avio_alloc_context(
 static void flush_buffer(AVIOContext *s)
 {
 if (s->buf_ptr > s->buffer) {
+int size = s->buf_ptr - s->buffer;
 if (!s->error) {
 int ret = 0;
 if (s->write_data_type)
 ret = s->write_data_type(s->opaque, s->buffer,
- s->buf_ptr - s->buffer,
+ size,
  s->current_type,
  s->last_time);
 else if (s->write_packet)
 ret = s->write_packet(s->opaque, s->buffer,
-  s->buf_ptr - s->buffer);
+  size);
 if (ret < 0) {
 s->error = ret;
+} else {
+if (s->pos + size > s->written)
+s->written = s->pos + size;
 }
 }
 if (s->current_type == AVIO_DATA_MARKER_SYNC_POINT ||
@@ -192,7 +196,7 @@ static void flush_buffer(AVIOContext *s)
  s->buf_ptr - s->checksum_ptr);
 s->checksum_ptr = s->buffer;
 }
-s->pos += s->buf_ptr - s->buffer;
+s->pos += size;
 }
 s->buf_ptr = s->buffer;
 }
@@ -301,6 +305,9 @@ int64_t avio_size(AVIOContext *s)
 if (!s)
 return AVERROR(EINVAL);
 
+if (s->written)
+return s->written;
+
 if (!s->seek)
 return AVERROR(ENOSYS);
 size = s->seek(s->opaque, 0, AVSEEK_SIZE);
-- 
2.9.2

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] APIChanges: Mention where release 12 was cut

[Vittorio Giovara]

Signed-off-by: Vittorio Giovara 
---
 doc/APIchanges | 4 
 1 file changed, 4 insertions(+)

diff --git a/doc/APIchanges b/doc/APIchanges
index 90c6500..dfd1532 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -49,6 +49,10 @@ API changes, most recent first:
   Deprecate struct vaapi_context and the vaapi.h installed header.
   Callers should set AVCodecContext.hw_frames_ctx instead.
 
+--8<-
+   12 branch was cut here
+->8--
+
 2016-07-20 - xxx - lavu 55.20.0 - cpu.h
   Add AV_CPU_FLAG_SSSE3SLOW.
 
-- 
2.10.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] omx: Fix OOM check

[Vittorio Giovara]

On Mon, Dec 5, 2016 at 3:29 PM, Martin Storsjö  wrote:
> On Mon, 5 Dec 2016, Timothy Gu wrote:
>
>> Also use av_mallocz_array().
>>
>> Found by Coverity in FFmpeg.
>> ---
>> libavcodec/omx.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavcodec/omx.c b/libavcodec/omx.c
>> index 0c61c2f..05c8743 100644
>> --- a/libavcodec/omx.c
>> +++ b/libavcodec/omx.c
>> @@ -352,12 +352,12 @@ static av_cold int find_component(OMXContext
>> *omx_context, void *logctx,
>> av_log(logctx, AV_LOG_WARNING, "No component for role %s found\n",
>> role);
>> return AVERROR_ENCODER_NOT_FOUND;
>> }
>> -components = av_mallocz(sizeof(char*) * num);
>> +components = av_mallocz_array(num, sizeof(*components));
>> if (!components)
>> return AVERROR(ENOMEM);
>> for (i = 0; i < num; i++) {
>> components[i] = av_mallocz(OMX_MAX_STRINGNAME_SIZE);
>> -if (!components) {
>> +if (!components[i]) {
>> ret = AVERROR(ENOMEM);
>> goto end;
>> }
>> --
>> 2.10.2
>
>
> Thanks, this looks ok to me.

Timothy told me the CID for this is CID 1396839, if you are going to
push it could you please add it using our standard template (Bug-Id:
xxx)?
Thank you
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] qsvdec: Fix memory leak

[Vittorio Giovara]

On Mon, Dec 5, 2016 at 2:31 PM, Timothy Gu  wrote:
> Are CIDs universal for both projects? I figured an FFmpeg CID is not useful
> for Libav.

They are universal, yes, especially in project coming from a shared code base.

> But either way for FFmpeg this patch is CID 1396851.

Thanks. Whoever pushes this please add it to the commit log using our
standard template (Bug-Id: xxx).
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] omx: Fix OOM check

[Martin Storsjö]

On Mon, 5 Dec 2016, Timothy Gu wrote:


Also use av_mallocz_array().

Found by Coverity in FFmpeg.
---
libavcodec/omx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 0c61c2f..05c8743 100644
--- a/libavcodec/omx.c
+++ b/libavcodec/omx.c
@@ -352,12 +352,12 @@ static av_cold int find_component(OMXContext 
*omx_context, void *logctx,
av_log(logctx, AV_LOG_WARNING, "No component for role %s found\n", 
role);
return AVERROR_ENCODER_NOT_FOUND;
}
-components = av_mallocz(sizeof(char*) * num);
+components = av_mallocz_array(num, sizeof(*components));
if (!components)
return AVERROR(ENOMEM);
for (i = 0; i < num; i++) {
components[i] = av_mallocz(OMX_MAX_STRINGNAME_SIZE);
-if (!components) {
+if (!components[i]) {
ret = AVERROR(ENOMEM);
goto end;
}
--
2.10.2


Thanks, this looks ok to me.

// Martin
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] configure: Simplify and fix avfoundation indev handling

[Diego Biurrun]

On Thu, Dec 01, 2016 at 03:34:48PM +0100, Diego Biurrun wrote:
> Handle extralibs in the standard way, add missing pthreads dependency.
> Also globally check for -fobj-arc with Objective-C compilers since
> that option is useful for other Objective-C code as well.
> ---
> 
> Needs some testing on OS X.

Testing and OKed by Vito on IRC.

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] avconv: Demote the bitstream estimation failure to DEBUG loglevel

[Luca Barbato]

---
 avconv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avconv.c b/avconv.c
index 5c31332..99c5c6b 100644
--- a/avconv.c
+++ b/avconv.c
@@ -941,7 +941,7 @@ static void print_report(int is_last_report, int64_t 
timer_start)
 if (total_size < 0) {
 char errbuf[128];
 av_strerror(total_size, errbuf, sizeof(errbuf));
-av_log(NULL, AV_LOG_VERBOSE, "Bitrate not available, "
+av_log(NULL, AV_LOG_DEBUG, "Bitrate not available, "
"avio_tell() failed: %s\n", errbuf);
 total_size = 0;
 }
-- 
2.9.2

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] qsvdec: Fix memory leak

[Timothy Gu]

On Mon, Dec 5, 2016 at 10:48 AM Vittorio Giovara 
wrote:

> While it's great to hear that it was "found by Coverity in FFmpeg", it
> would more useful to mention the CID number.
> As you may know, Coverity is able to hash same issues in different
> repositories, so by using the CID number it's possible to pinpoint the
> problem in both Libav and FFmpeg.
>


> Would you resending them writing down the CID, or just reply back with
> the CID and someone will edit the commit message?


Are CIDs universal for both projects? I figured an FFmpeg CID is not useful
for Libav.

But either way for FFmpeg this patch is CID1396851.

Timothy
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] qsvdec: Fix memory leak

[Vittorio Giovara]

On Mon, Dec 5, 2016 at 1:21 PM, Timothy Gu  wrote:
> Found by Coverity in FFmpeg.

Hey Timothy, thanks for your patches.
While it's great to hear that it was "found by Coverity in FFmpeg", it
would more useful to mention the CID number.
As you may know, Coverity is able to hash same issues in different
repositories, so by using the CID number it's possible to pinpoint the
problem in both Libav and FFmpeg.
Would you resending them writing down the CID, or just reply back with
the CID and someone will edit the commit message?
Thanks
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 04/13] configure: Disentangle vfw32 and user32 lib handling

[Diego Biurrun]

On Mon, Dec 05, 2016 at 05:39:57PM +0100, Hendrik Leppkes wrote:
> On Tue, Nov 29, 2016 at 7:34 PM, Diego Biurrun  wrote:
> > --- a/configure
> > +++ b/configure
> > @@ -2382,7 +2382,6 @@ sndio_indev_deps="sndio_h"
> >  sndio_outdev_deps="sndio_h"
> >  v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
> >  vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
> > -vfwcap_indev_extralibs="-lavicap32"
> >  xcbgrab_indev_deps="libxcb"
> >
> >  # protocols
> > @@ -3041,7 +3040,6 @@ msvc_common_flags(){
> >  -mthumb)  ;;
> >  -march=*) ;;
> >  -lz)  echo zlib.lib ;;
> > --lavicap32)   echo vfw32.lib user32.lib ;;
> >  -lx264)   echo libx264.lib ;;
> >  -l*)  echo ${flag#-l}.lib ;;
> >  -L*)  echo -libpath:${flag#-L} ;;
> > @@ -4752,7 +4750,7 @@ check_header AVFoundation/AVFoundation.h &&
> >
> >  check_header sys/videoio.h
> >
> > -check_func_headers "windows.h vfw.h" capCreateCaptureWindow 
> > "$vfwcap_indev_extralibs"
> > +check_lib "windows.h vfw.h" capCreateCaptureWindow -lvfw32
> >  # check that WM_CAP_DRIVER_CONNECT is defined to the proper value
> >  # w32api 3.12 had it defined wrong
> >  check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable 
> > vfwcap_defines
> > @@ -4804,6 +4802,10 @@ if enabled libxcb; then
> >  fi
> >
> >  enabled dxva2 &&
> > +check_lib "windows.h winuser.h" GetShellWindow -luser32 ||
> > +disable dxva2
> > +
> > +enabled dxva2 &&
> >  check_lib windows.h CoTaskMemFree -lole32 &&
> >  enable dxva2_lib
> 
> This entirely takes out linking against avicap32, and replaces it with
> vfw32, presumably this was once required (except for msvc). That does
> introduce a distinct change in linking, so it would need testing on
> all supported versions of mingw.

This patch survives on everything that we have on Oracle.

> Also does vfwcap indev not require user32 anymore, like it apparently used to?

I'll make a run through Oracle that turns off dxva2 or test it manually.

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] qsvdec: Fix memory leak

[Timothy Gu]

Found by Coverity in FFmpeg.
---
 libavcodec/qsvdec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index b6fead0..b83b0fc 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -306,8 +306,10 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q,
 
 do {
 ret = get_surface(avctx, q, );
-if (ret < 0)
+if (ret < 0) {
+av_freep();
 return ret;
+}
 
 ret = MFXVideoDECODE_DecodeFrameAsync(q->session, avpkt->size ?  : 
NULL,
   insurf, , sync);
-- 
2.10.2

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] omx: Fix OOM check

[Timothy Gu]

Also use av_mallocz_array().

Found by Coverity in FFmpeg.
---
 libavcodec/omx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 0c61c2f..05c8743 100644
--- a/libavcodec/omx.c
+++ b/libavcodec/omx.c
@@ -352,12 +352,12 @@ static av_cold int find_component(OMXContext 
*omx_context, void *logctx,
 av_log(logctx, AV_LOG_WARNING, "No component for role %s found\n", 
role);
 return AVERROR_ENCODER_NOT_FOUND;
 }
-components = av_mallocz(sizeof(char*) * num);
+components = av_mallocz_array(num, sizeof(*components));
 if (!components)
 return AVERROR(ENOMEM);
 for (i = 0; i < num; i++) {
 components[i] = av_mallocz(OMX_MAX_STRINGNAME_SIZE);
-if (!components) {
+if (!components[i]) {
 ret = AVERROR(ENOMEM);
 goto end;
 }
-- 
2.10.2

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 04/13] configure: Disentangle vfw32 and user32 lib handling

[Hendrik Leppkes]

On Tue, Nov 29, 2016 at 7:34 PM, Diego Biurrun  wrote:
> ---
>  configure | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 18cec1a..74d89e2 100755
> --- a/configure
> +++ b/configure
> @@ -2382,7 +2382,6 @@ sndio_indev_deps="sndio_h"
>  sndio_outdev_deps="sndio_h"
>  v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
>  vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
> -vfwcap_indev_extralibs="-lavicap32"
>  xcbgrab_indev_deps="libxcb"
>
>  # protocols
> @@ -3041,7 +3040,6 @@ msvc_common_flags(){
>  -mthumb)  ;;
>  -march=*) ;;
>  -lz)  echo zlib.lib ;;
> --lavicap32)   echo vfw32.lib user32.lib ;;
>  -lx264)   echo libx264.lib ;;
>  -l*)  echo ${flag#-l}.lib ;;
>  -L*)  echo -libpath:${flag#-L} ;;
> @@ -4752,7 +4750,7 @@ check_header AVFoundation/AVFoundation.h &&
>
>  check_header sys/videoio.h
>
> -check_func_headers "windows.h vfw.h" capCreateCaptureWindow 
> "$vfwcap_indev_extralibs"
> +check_lib "windows.h vfw.h" capCreateCaptureWindow -lvfw32
>  # check that WM_CAP_DRIVER_CONNECT is defined to the proper value
>  # w32api 3.12 had it defined wrong
>  check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable 
> vfwcap_defines
> @@ -4804,6 +4802,10 @@ if enabled libxcb; then
>  fi
>
>  enabled dxva2 &&
> +check_lib "windows.h winuser.h" GetShellWindow -luser32 ||
> +disable dxva2
> +
> +enabled dxva2 &&
>  check_lib windows.h CoTaskMemFree -lole32 &&
>  enable dxva2_lib
>

This entirely takes out linking against avicap32, and replaces it with
vfw32, presumably this was once required (except for msvc). That does
introduce a distinct change in linking, so it would need testing on
all supported versions of mingw.
Also does vfwcap indev not require user32 anymore, like it apparently used to?

- Hendrik
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] configure: Move COMPONENT_LIST to the bottom of CONFIG_LIST

[Diego Biurrun]

This ensures that dependencies are resolved correctly. COMPONENT_LIST
can contain parts that depend on previous entries of CONFIG_LIST.
---

This fixes the issue that Martin noticed with omx_rpi and the actual
omx encoders not getting enabled.

 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index b4680e4..52a09f7 100755
--- a/configure
+++ b/configure
@@ -1362,8 +1362,8 @@ SUBSYSTEM_LIST="
 rdft
 "
 
+# COMPONENT_LIST needs to be the last to ensure correct dependency checking
 CONFIG_LIST="
-$COMPONENT_LIST
 $EXAMPLE_LIST
 $EXTERNAL_LIBRARY_LIST
 $HWACCEL_LIBRARY_LIST
@@ -1379,6 +1379,7 @@ CONFIG_LIST="
 thumb
 valgrind_backtrace
 xmm_clobber_test
+$COMPONENT_LIST
 "
 
 THREADS_LIST="
-- 
2.1.4

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 1/3] build: Create a component for MPEG audio header decoding

[Diego Biurrun]

On Sat, Dec 03, 2016 at 05:46:36PM -0500, Vittorio Giovara wrote:
> On Sat, Dec 3, 2016 at 9:16 AM, Diego Biurrun  wrote:
> > Fixes standalone compilation of the libmp3lame encoder.
> > ---
> >  configure   |  5 -
> >  libavcodec/Makefile | 10 --
> >  2 files changed, 8 insertions(+), 7 deletions(-)
> 
> I wonder if it should be split in two, but ok anyway.

mpegaudiodecheader.o uses symbols from mpegaudiodata.o, so they
cannot be separated, at least the former must always imply the
latter.

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 13/13] build: Add EXTRALIBS to TOOLS linker command

[Luca Barbato]

On 29/11/2016 19:34, Diego Biurrun wrote:
> EXTRALIBS contains general and platform-specific extra libraries
> that should be part of all linker commands.
> ---
> 
> This fixes linking the TOOLS on Symbian.
> 
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index e0cf1e3..f3d3f80 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -117,7 +117,7 @@ FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
>  all: $(AVPROGS) alltools checkheaders examples testprogs
>  
>  $(TOOLS): %$(EXESUF): %.o
> - $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
> + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS) $(ELIBS)
>  
>  tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
>  
> 

Seems fine.
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 06/13] configure: Add missing cuda dependency to nvenc

[Luca Barbato]

On 29/11/2016 19:34, Diego Biurrun wrote:
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index eb3dc7a..aab5a68 100755
> --- a/configure
> +++ b/configure
> @@ -2190,7 +2190,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
>  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
>  
>  # hardware-accelerated codecs
> -nvenc_deps_any="dlopen LoadLibrary"
> +nvenc_deps_any="cuda dlopen LoadLibrary"
>  nvenc_extralibs='$ldl'
>  omx_deps="dlopen pthreads"
>  omx_extralibs='$ldl'

I'm not 100% sure it works as intended.
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 04/13] configure: Disentangle vfw32 and user32 lib handling

[Luca Barbato]

On 29/11/2016 19:34, Diego Biurrun wrote:
> ---
>  configure | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 

Ok if tested.

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 03/13] configure: Handle dxva2 optional components in the standard way

[Luca Barbato]

On 29/11/2016 19:34, Diego Biurrun wrote:
> ---
> 
> This adds -lole32 to the general extralibs, but that goes away at the
> end of the series.
> 
>  configure | 9 -
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 

Should not hurt.

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 02/13] configure: Separate package name and version requirements in helper functions

[Luca Barbato]

On 29/11/2016 19:34, Diego Biurrun wrote:
> The unadorned package name is needed to derive package-related variable names.
> ---
>  configure | 14 --
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 

Seems fine

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] configure: Simplify OMX check

[Diego Biurrun]

On Sun, Dec 04, 2016 at 11:20:51PM +0200, Martin Storsjö wrote:
> On Sun, 4 Dec 2016, Diego Biurrun wrote:
> >--- a/configure
> >+++ b/configure
> >@@ -2190,6 +2190,7 @@ nvenc_deps_any="dlopen LoadLibrary"
> >nvenc_extralibs='$ldl'
> >omx_deps="dlopen pthreads"
> >omx_extralibs='$ldl'
> >+omx_rpi_select="omx"
> >qsvdec_select="qsv"
> >qsvenc_select="qsv"
> >vaapi_encode_deps="vaapi"
> >@@ -4685,12 +4686,10 @@ enabled mmal  && { check_lib 
> >interface/mmal/mmal.h mmal_port_connect
> >check_lib interface/mmal/mmal.h 
> > mmal_port_connect ; } ||
> >   die "ERROR: mmal not found"; }
> >enabled mmal && check_func_headers interface/mmal/mmal.h 
> >"MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"
> >-enabled omx_rpi && enable omx
> >-enabled omx   && { check_header OMX_Core.h ||
> >-{ ! enabled cross_compile && enabled 
> >omx_rpi && {
> >-add_cflags -isystem/opt/vc/include/IL ; 
> >}
> >-check_header OMX_Core.h ; } ||
> >+enabled omx_rpi   && { check_header OMX_Core.h ||
> >+   { ! enabled cross_compile && add_cflags 
> >-isystem/opt/vc/include/IL && check_header OMX_Core.h ; } ||
> >   die "ERROR: OpenMAX IL headers not found"; }
> >+enabled omx   && { check_header OMX_Core.h || die "ERROR: 
> >OpenMAX IL headers not found"; }
> >enabled openssl   && { { check_pkg_config openssl openssl/ssl.h 
> >OPENSSL_init_ssl ||
> > check_pkg_config openssl openssl/ssl.h 
> > SSL_library_init; } && {
> >   add_cflags $openssl_cflags && add_extralibs 
> > $openssl_libs; }||
> 
> I was almost about to say that it seems ok, but it fails one cruicial
> detail:
> 
> After running ./configure --enable-omx-rpi, I get the following in config.h:
> 
> #define CONFIG_OMX 1
> #define CONFIG_OMX_RPI 1
> #define CONFIG_H264_OMX_ENCODER 0
> #define CONFIG_MPEG4_OMX_ENCODER 0
> 
> With the current master, they all end up as 1 as intended.

This should not happen of course. I know the reason, this patch is the
symptom of the underlying problem. Patch coming up shortly.
Thanks for noticing.

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel