[FFmpeg-cvslog] lavf/avio: Print the https warning also for missing tls protocol.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Oct 22 
01:11:55 2017 +0200| [3605b312f65c4a009301d2d165e2db8d68063acb] | committer: 
Carl Eugen Hoyos

lavf/avio: Print the https warning also for missing tls protocol.

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

 libavformat/avio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 4718753b7b..4dc468350c 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -297,7 +297,7 @@ int ffurl_alloc(URLContext **puc, const char *filename, int 
flags,
return url_alloc_for_protocol(puc, p, filename, flags, int_cb);
 
 *puc = NULL;
-if (av_strstart(filename, "https:", NULL))
+if (av_strstart(filename, "https:", NULL) || av_strstart(filename, "tls:", 
NULL))
 av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile 
FFmpeg with "
  "openssl, gnutls "
  "or securetransport enabled.\n");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: drop VDA

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch  | Tue Sep  5 
15:58:13 2017 +0200| [2b320318273b74df6e1b712fb33544d6a1b26be1] | committer: 
Clément Bœsch

lavc: drop VDA

Deprecated (aka removed) in OSX 10.11, and we have a replacement for it
(VideoToolbox).

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

 Changelog   |   1 +
 MAINTAINERS |   1 -
 configure   |  14 -
 doc/ffmpeg.texi |   3 -
 fftools/ffmpeg.h|   2 -
 fftools/ffmpeg_opt.c|   6 +-
 fftools/ffmpeg_videotoolbox.c   |  45 +--
 libavcodec/Makefile |   7 +-
 libavcodec/allcodecs.c  |   3 -
 libavcodec/h264_slice.c |   5 -
 libavcodec/vda.c|  84 -
 libavcodec/vda.h| 230 -
 libavcodec/vda_h264.c   | 425 
 libavcodec/vda_h264_dec.c   | 263 ---
 libavcodec/videotoolbox.c   |  10 +-
 libavcodec/{vda_vt_internal.h => vt_internal.h} |  16 +-
 libavutil/pixdesc.c |  10 -
 libavutil/pixfmt.h  |   3 -
 libavutil/utils.c   |   3 -
 19 files changed, 14 insertions(+), 1117 deletions(-)

diff --git a/Changelog b/Changelog
index b7c1348f77..6592d868da 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,7 @@ version :
 - Bitstream filters for editing metadata in H.264, HEVC and MPEG-2 streams
 - Dropped support for OpenJPEG versions 2.0 and below. Using OpenJPEG now
   requires 2.1 (or later) and pkg-config.
+- VDA dropped (use VideoToolbox instead)
 
 
 version 3.4:
diff --git a/MAINTAINERS b/MAINTAINERS
index 9027ed5846..1d2ff78b0e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -244,7 +244,6 @@ Codecs:
   txd.c Ivo van Poorten
   vc2*  Rostislav Pehlivanov
   vcr1.cMichael Niedermayer
-  vda_h264_dec.cXidorn Quan
   videotoolboxenc.c Rick Kern
   vima.cPaul B Mahol
   vorbisdec.c   Denes Balatoni, David Conrad
diff --git a/configure b/configure
index 31830d4fcd..e487610c1a 100755
--- a/configure
+++ b/configure
@@ -318,7 +318,6 @@ External library support:
   --enable-omx-rpi enable OpenMAX IL code for Raspberry Pi [no]
   --enable-rkmpp   enable Rockchip Media Process Platform code [no]
   --disable-vaapi  disable Video Acceleration API (mainly Unix/Intel) 
code [autodetect]
-  --disable-vdadisable Apple Video Decode Acceleration code 
[autodetect]
   --disable-vdpau  disable Nvidia Video Decode and Presentation API 
for Unix code [autodetect]
   --disable-videotoolbox   disable VideoToolbox code [autodetect]
 
@@ -1650,7 +1649,6 @@ HWACCEL_AUTODETECT_LIBRARY_LIST="
 dxva2
 nvenc
 vaapi
-vda
 vdpau
 videotoolbox
 v4l2_m2m
@@ -2660,10 +2658,6 @@ cuda_deps_any="libdl LoadLibrary"
 cuvid_deps="cuda"
 d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"
 dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32"
-vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h blocks_extension"
-vda_framework_extralibs="-framework VideoDecodeAcceleration"
-vda_deps="vda_framework pthreads corefoundation"
-vda_extralibs="-framework QuartzCore"
 videotoolbox_hwaccel_deps="videotoolbox pthreads"
 videotoolbox_hwaccel_extralibs="-framework QuartzCore"
 xvmc_deps="X11_extensions_XvMClib_h"
@@ -2685,10 +2679,6 @@ h264_mmal_hwaccel_deps="mmal"
 h264_qsv_hwaccel_deps="libmfx"
 h264_vaapi_hwaccel_deps="vaapi"
 h264_vaapi_hwaccel_select="h264_decoder"
-h264_vda_hwaccel_deps="vda"
-h264_vda_hwaccel_select="h264_decoder"
-h264_vda_old_hwaccel_deps="vda"
-h264_vda_old_hwaccel_select="h264_decoder"
 h264_vdpau_hwaccel_deps="vdpau"
 h264_vdpau_hwaccel_select="h264_decoder"
 h264_videotoolbox_hwaccel_deps="videotoolbox"
@@ -2822,8 +2812,6 @@ h264_rkmpp_decoder_deps="rkmpp"
 h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"
 h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
 h264_vaapi_encoder_select="cbs_h264 vaapi_encode"
-h264_vda_decoder_deps="vda"
-h264_vda_decoder_select="h264_decoder"
 h264_vdpau_decoder_deps="vdpau"
 h264_vdpau_decoder_select="h264_decoder"
 h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m"
@@ -3011,7 +2999,6 @@ libzvbi_teletext_decoder_deps="libzvbi"
 videotoolbox_suggest="coreservices"
 videotoolbox_deps="corefoundation coremedia corevideo"
 videotoolbox_encoder_deps="videotoolbox 
VTCompressionSessionPrepareToEncodeFrames"
-videotoolbox_encoder_suggest="vda_framework"
 
 # dem

[FFmpeg-cvslog] mov: fix decode of fragments that overlap in time

[John Stebbins]

ffmpeg | branch: master | John Stebbins  | Thu Oct 12 
10:59:23 2017 -0700| [4a9d32baca3af0d1831f9556a922c7ab5b426b10] | committer: 
Michael Niedermayer

mov: fix decode of fragments that overlap in time

When keyframe intervals of dash segments are not perfectly aligned,
fragments in the stream can overlap in time. The previous sorting by
timestamp causes packets to be read out of decode order and results
in decode errors.

Insert new "trun" index entries into index_entries in the order that
the trun are referenced by the sidx.

Signed-off-by: Michael Niedermayer 

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

 libavformat/isom.h |  26 +-
 libavformat/mov.c  | 684 -
 2 files changed, 485 insertions(+), 225 deletions(-)

diff --git a/libavformat/isom.h b/libavformat/isom.h
index b9380e9dcc..395d20d25c 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -93,7 +93,6 @@ typedef struct MOVFragment {
 unsigned duration;
 unsigned size;
 unsigned flags;
-int64_t time;
 } MOVFragment;
 
 typedef struct MOVTrackExt {
@@ -109,17 +108,28 @@ typedef struct MOVSbgp {
 unsigned int index;
 } MOVSbgp;
 
+typedef struct MOVFragmentStreamInfo {
+int id;
+int64_t sidx_pts;
+int64_t first_tfra_pts;
+int64_t tfdt_dts;
+int index_entry;
+} MOVFragmentStreamInfo;
+
 typedef struct MOVFragmentIndexItem {
 int64_t moof_offset;
-int64_t time;
 int headers_read;
+int current;
+int nb_stream_info;
+MOVFragmentStreamInfo * stream_info;
 } MOVFragmentIndexItem;
 
 typedef struct MOVFragmentIndex {
-unsigned track_id;
-unsigned item_count;
-unsigned current_item;
-MOVFragmentIndexItem *items;
+int allocated_size;
+int complete;
+int current;
+int nb_items;
+MOVFragmentIndexItem * item;
 } MOVFragmentIndex;
 
 typedef struct MOVIndexRange {
@@ -250,9 +260,7 @@ typedef struct MOVContext {
 int moov_retry;
 int use_mfra_for;
 int has_looked_for_mfra;
-MOVFragmentIndex** fragment_index_data;
-unsigned fragment_index_count;
-int fragment_index_complete;
+MOVFragmentIndex frag_index;
 int atom_depth;
 unsigned int aax_mode;  ///< 'aax' file has been detected
 uint8_t file_key[20];
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 573f134d2d..a5177e8f91 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1168,6 +1168,211 @@ static int mov_read_moov(MOVContext *c, AVIOContext 
*pb, MOVAtom atom)
 return 0; /* now go for mdat */
 }
 
+static MOVFragmentStreamInfo * get_frag_stream_info(
+MOVFragmentIndex *frag_index,
+int index,
+int id)
+{
+int i;
+MOVFragmentIndexItem * item;
+
+if (index < 0 || index >= frag_index->nb_items)
+return NULL;
+item = &frag_index->item[index];
+for (i = 0; i < item->nb_stream_info; i++)
+if (item->stream_info[i].id == id)
+return &item->stream_info[i];
+
+// This shouldn't happen
+return NULL;
+}
+
+static void set_frag_stream(MOVFragmentIndex *frag_index, int id)
+{
+int i;
+MOVFragmentIndexItem * item;
+
+if (frag_index->current < 0 ||
+frag_index->current >= frag_index->nb_items)
+return;
+
+item = &frag_index->item[frag_index->current];
+for (i = 0; i < item->nb_stream_info; i++)
+if (item->stream_info[i].id == id) {
+item->current = i;
+return;
+}
+
+// id not found.  This shouldn't happen.
+item->current = -1;
+}
+
+static MOVFragmentStreamInfo * get_current_frag_stream_info(
+MOVFragmentIndex *frag_index)
+{
+MOVFragmentIndexItem * item = &frag_index->item[frag_index->current];
+if (item->current >= 0 && item->current < item->nb_stream_info)
+return &item->stream_info[item->current];
+
+// This shouldn't happen
+return NULL;
+}
+
+static int search_frag_moof_offset(MOVFragmentIndex *frag_index, int64_t 
offset)
+{
+int a, b, m;
+int64_t moof_offset;
+
+// Optimize for appending new entries
+if (!frag_index->nb_items ||
+frag_index->item[frag_index->nb_items - 1].moof_offset < offset)
+return frag_index->nb_items;
+
+a = -1;
+b = frag_index->nb_items;
+
+while (b - a > 1) {
+m = (a + b) >> 1;
+moof_offset = frag_index->item[m].moof_offset;
+if (moof_offset >= offset)
+b = m;
+if (moof_offset <= offset)
+a = m;
+}
+return b;
+}
+
+static int64_t get_stream_info_time(MOVFragmentStreamInfo * frag_stream_info)
+{
+
+if (frag_stream_info) {
+if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE)
+return frag_stream_info->sidx_pts;
+if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE)
+return frag_stream_info->first_tfra_pts;
+if (frag_stream_info->tfdt_dts != AV_NOPTS_VALUE)
+return frag_stream_

[FFmpeg-cvslog] ffmpeg: add -bitexact flag to simplify enabling bitexact mode in (de)muxer and (de/en)coder

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun 
Oct 22 01:41:57 2017 +0200| [2c9fa4162b346a394188a2e5a3442076155f2e34] | 
committer: Michael Niedermayer

ffmpeg: add -bitexact flag to simplify enabling bitexact mode in (de)muxer and 
(de/en)coder

Signed-off-by: Michael Niedermayer 

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

 doc/ffmpeg.texi  |  2 ++
 fftools/ffmpeg.h |  1 +
 fftools/ffmpeg_opt.c | 16 
 3 files changed, 19 insertions(+)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index cdb3bc68ae..7db80ebf6a 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1250,6 +1250,8 @@ or as a floating point number (e.g. 0.04166, 2.0833e-5)
 
 Default value is 0.
 
+@item -bitexact (@emph{input/output})
+Enable bitexact mode for (de)muxer and (de/en)coder
 @item -shortest (@emph{output})
 Finish encoding when the shortest input stream ends.
 @item -dts_delta_threshold
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 0db481d747..50fc8d5767 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -160,6 +160,7 @@ typedef struct OptionsContext {
 float mux_preload;
 float mux_max_delay;
 int shortest;
+int bitexact;
 
 int video_disable;
 int audio_disable;
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 2fa5d6d286..d441d29390 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -782,6 +782,9 @@ static void add_input_streams(OptionsContext *o, 
AVFormatContext *ic)
 exit_program(1);
 }
 
+if (o->bitexact)
+ist->dec_ctx->flags |= AV_CODEC_FLAG_BITEXACT;
+
 switch (par->codec_type) {
 case AVMEDIA_TYPE_VIDEO:
 if(!ist->dec)
@@ -1045,6 +1048,8 @@ static int open_input_file(OptionsContext *o, const char 
*filename)
 av_format_set_data_codec(ic, find_codec_or_die(data_codec_name, 
AVMEDIA_TYPE_DATA, 0));
 
 ic->flags |= AVFMT_FLAG_NONBLOCK;
+if (o->bitexact)
+ic->flags |= AVFMT_FLAG_BITEXACT;
 ic->interrupt_callback = int_cb;
 
 if (!av_dict_get(o->g->format_opts, "scan_all_pmts", NULL, 
AV_DICT_MATCH_CASE)) {
@@ -1366,6 +1371,10 @@ static OutputStream *new_output_stream(OptionsContext 
*o, AVFormatContext *oc, e
 ost->encoder_opts = filter_codec_opts(o->g->codec_opts, 
AV_CODEC_ID_NONE, oc, st, NULL);
 }
 
+
+if (o->bitexact)
+ost->enc_ctx->flags |= AV_CODEC_FLAG_BITEXACT;
+
 MATCH_PER_STREAM_OPT(time_bases, str, time_base, oc, st);
 if (time_base) {
 AVRational q;
@@ -2144,6 +2153,10 @@ static int open_output_file(OptionsContext *o, const 
char *filename)
 const AVOption *o = av_opt_find(oc, "fflags", NULL, 0, 0);
 av_opt_eval_flags(oc, o, e->value, &format_flags);
 }
+if (o->bitexact) {
+format_flags |= AVFMT_FLAG_BITEXACT;
+oc->flags|= AVFMT_FLAG_BITEXACT;
+}
 
 /* create streams for all unlabeled output pads */
 for (i = 0; i < nb_filtergraphs; i++) {
@@ -3467,6 +3480,9 @@ const OptionDef options[] = {
 { "shortest",   OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
 OPT_OUTPUT,  { .off = 
OFFSET(shortest) },
 "finish encoding within shortest input" },
+{ "bitexact",   OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
+OPT_OUTPUT | OPT_INPUT,  { .off = 
OFFSET(bitexact) },
+"bitexact mode" },
 { "apad",   OPT_STRING | HAS_ARG | OPT_SPEC |
 OPT_OUTPUT,  { .off = 
OFFSET(apad) },
 "audio pad", "" },

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö  | Mon Oct 23 
10:48:02 2017 +0300| [f1fd12ef858cf7efe843aa3063894a11b2d1e7d5] | committer: 
Carl Eugen Hoyos

lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

This was missed in e754c8e8 / e2710e790c0 since those functions
weren't exercised by checkasm.

Fixes ticket #6766.

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

 libavutil/arm/float_dsp_init_vfp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/arm/float_dsp_init_vfp.c 
b/libavutil/arm/float_dsp_init_vfp.c
index e15abf3f54..05873e7e37 100644
--- a/libavutil/arm/float_dsp_init_vfp.c
+++ b/libavutil/arm/float_dsp_init_vfp.c
@@ -36,11 +36,11 @@ void ff_butterflies_float_vfp(float *av_restrict v1, float 
*av_restrict v2, int
 
 av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp, int cpu_flags)
 {
-if (!have_vfpv3(cpu_flags)) {
+if (have_vfp_vm(cpu_flags)) {
 fdsp->vector_fmul = ff_vector_fmul_vfp;
 fdsp->vector_fmul_window = ff_vector_fmul_window_vfp;
 }
 fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;
-if (!have_vfpv3(cpu_flags))
+if (have_vfp_vm(cpu_flags))
 fdsp->butterflies_float = ff_butterflies_float_vfp;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

[Martin Storsjö]

ffmpeg | branch: release/3.4 | Martin Storsjö  | Mon Oct 23 
10:48:02 2017 +0300| [587fadaef1e8163b3e56043e500a3724e7fc5379] | committer: 
Carl Eugen Hoyos

lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

This was missed in e754c8e8 / e2710e790c0 since those functions
weren't exercised by checkasm.

Fixes ticket #6766.
(cherry picked from commit f1fd12ef858cf7efe843aa3063894a11b2d1e7d5)

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

 libavutil/arm/float_dsp_init_vfp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/arm/float_dsp_init_vfp.c 
b/libavutil/arm/float_dsp_init_vfp.c
index e15abf3f54..05873e7e37 100644
--- a/libavutil/arm/float_dsp_init_vfp.c
+++ b/libavutil/arm/float_dsp_init_vfp.c
@@ -36,11 +36,11 @@ void ff_butterflies_float_vfp(float *av_restrict v1, float 
*av_restrict v2, int
 
 av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp, int cpu_flags)
 {
-if (!have_vfpv3(cpu_flags)) {
+if (have_vfp_vm(cpu_flags)) {
 fdsp->vector_fmul = ff_vector_fmul_vfp;
 fdsp->vector_fmul_window = ff_vector_fmul_window_vfp;
 }
 fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;
-if (!have_vfpv3(cpu_flags))
+if (have_vfp_vm(cpu_flags))
 fdsp->butterflies_float = ff_butterflies_float_vfp;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avutil/frame: remove unneccessary metadata pointer getter

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 10:58:00 
2017 -0300| [8c2b82912334a3b41cfd4a9c8bf195e7c67cfb2a] | committer: James Almer

avutil/frame: remove unneccessary metadata pointer getter

Signed-off-by: James Almer 

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

 libavutil/frame.c | 2 --
 libavutil/frame.h | 1 -
 2 files changed, 3 deletions(-)

diff --git a/libavutil/frame.c b/libavutil/frame.c
index d5fd2932e3..09dd98a6b5 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -48,8 +48,6 @@ MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range)
(frame)->channels == \
av_get_channel_layout_nb_channels((frame)->channel_layout))
 
-AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame) {return 
&frame->metadata;};
-
 #if FF_API_FRAME_QP
 int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int 
qp_type)
 {
diff --git a/libavutil/frame.h b/libavutil/frame.h
index abe4f4fd17..fef558ea2f 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -587,7 +587,6 @@ int av_frame_get_decode_error_flags   (const AVFrame 
*frame);
 voidav_frame_set_decode_error_flags   (AVFrame *frame, int val);
 int av_frame_get_pkt_size(const AVFrame *frame);
 voidav_frame_set_pkt_size(AVFrame *frame, int val);
-AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
 #if FF_API_FRAME_QP
 int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
 int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: Drop deprecated debug mv functionality

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:13:43 2016 -0500| [8933ac2079644fb09916f1875c569103aefe84b1] | 
committer: Vittorio Giovara

lavc: Drop deprecated debug mv functionality

Deprecated in 10/2013.

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

 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 11a3280eb8..b77f940d30 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2655,12 +2655,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
@@ -2670,24 +2664,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 3ac53fb748..445515f0ee 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

[FFmpeg-cvslog] lavc: Drop deprecated workaround bugs options

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:19:58 2016 -0500| [0c7986df444273b0e53d3992ba9cc1108bd6a386] | 
committer: Vittorio Giovara

lavc: Drop deprecated workaround bugs options

Illegal ac_vlc and old msmpeg4 detection deprecated in 10/2013.

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

 libavcodec/avcodec.h   | 6 --
 libavcodec/options_table.h | 6 --
 libavcodec/version.h   | 6 --
 3 files changed, 18 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b77f940d30..5ed3801d75 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2596,16 +2596,10 @@ 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
 #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 445515f0ee..92fad60969 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -135,16 +135,10 @@ 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"},
 {"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 1f738a778a..225ee52a64 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,12 +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
 #ifndef FF_API_ASPECT_EXTENDED
 #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: Drop deprecated architectures symbols

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:27:16 2016 -0500| [0871e233d9161e7f3554bcad19dabc9e15e1] | 
committer: Vittorio Giovara

lavc: Drop deprecated architectures symbols

Alpha deprecated in 11/2013.
Sh4 and sparc deprecated in 01/2014.

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

 libavcodec/avcodec.h   | 9 -
 libavcodec/options_table.h | 6 --
 libavcodec/version.h   | 9 -
 3 files changed, 24 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 76c86eb6ba..1eb3ac6f4a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2734,9 +2734,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
@@ -2747,14 +2744,8 @@ 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
-#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 92fad60969..7257791292 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -205,16 +205,10 @@ 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"},
 {"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 bc8bdad0f4..6f69f2d59c 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
@@ -74,12 +71,6 @@
 #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
-#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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: Drop deprecated extended aspect ratio symbol

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:22:05 2016 -0500| [c06e73929199c4bdbb32ffb3d81c27ea57dd1458] | 
committer: Vittorio Giovara

lavc: Drop deprecated extended aspect ratio symbol

Deprecated in 10/2013.

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

 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 5ed3801d75..76c86eb6ba 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1620,10 +1620,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 3e54204f0f..ce697da20e 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 225ee52a64..bc8bdad0f4 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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '8933ac2079644fb09916f1875c569103aefe84b1'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 14:55:48 
2017 -0300| [d8a124e7ebc0c737ad398664bd0d55ac4f7f7ae3] | committer: James Almer

Merge commit '8933ac2079644fb09916f1875c569103aefe84b1'

* commit '8933ac2079644fb09916f1875c569103aefe84b1':
  lavc: Drop deprecated debug mv functionality

This commit is a noop. A discussion is currently ongoing about the
removal of this feature.

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 14:59:23 
2017 -0300| [51b88c3d4eb5838975b7338bc85a77a38b3f1af8] | committer: James Almer

Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'

* commit '0c7986df444273b0e53d3992ba9cc1108bd6a386':
  lavc: Drop deprecated workaround bugs options

Merged-by: James Almer 

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

 libavcodec/avcodec.h   | 6 --
 libavcodec/options_table.h | 6 --
 libavcodec/version.h   | 6 --
 3 files changed, 18 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 40c8fab369..5f124a0c24 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2927,16 +2927,10 @@ 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
 #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 2ac37c3ff1..7a3e765d88 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -144,16 +144,10 @@ 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"},
 {"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 b09beaa3b9..cf24b41331 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,12 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#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
 #ifndef FF_API_ASPECT_EXTENDED
 #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif


==

diff --cc libavcodec/version.h
index b09beaa3b9,225ee52a64..cf24b41331
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,24 -45,8 +45,18 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the 
change.
   */
  
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
 +#ifndef FF_API_DEBUG_MV
 +#define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
- #ifndef FF_API_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
  #ifndef FF_API_ASPECT_EXTENDED
  #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif

___

[FFmpeg-cvslog] lavc: Remove deprecated XvMC support hacks

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun  | Wed Dec  7 
08:18:41 2016 +0100| [dcc39ee10e82833ce24aa57926c00ffeb1948198] | committer: 
Vittorio Giovara

lavc: Remove deprecated XvMC support hacks

Deprecated in 11/2013.

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

 configure |   3 -
 libavcodec/4xm.c  |   2 +-
 libavcodec/Makefile   |   3 -
 libavcodec/allcodecs.c|   3 -
 libavcodec/asvdec.c   |   2 +-
 libavcodec/avcodec.h  |  17 ---
 libavcodec/bink.c |   2 +-
 libavcodec/blockdsp.c |  10 +-
 libavcodec/blockdsp.h |  10 +-
 libavcodec/cavs.c |   2 +-
 libavcodec/codec_desc.c   |  11 +-
 libavcodec/dnxhddec.c |   2 +-
 libavcodec/dnxhdenc.c |   2 +-
 libavcodec/eamad.c|   2 +-
 libavcodec/eatqi.c|   2 +-
 libavcodec/error_resilience.c |  21 ---
 libavcodec/g2meet.c   |   2 +-
 libavcodec/intrax8.c  |   2 +-
 libavcodec/jvdec.c|   2 +-
 libavcodec/mdec.c |   2 +-
 libavcodec/mimic.c|   2 +-
 libavcodec/mjpegdec.c |   2 +-
 libavcodec/mpeg12dec.c| 103 -
 libavcodec/mpegvideo.c|  29 +---
 libavcodec/mpegvideo_xvmc.c   | 337 --
 libavcodec/options_table.h|   3 -
 libavcodec/vc1dec.c   |   2 +-
 libavcodec/version.h  |   3 -
 libavcodec/wmv2.c |   2 +-
 libavcodec/x86/blockdsp.c |  16 +-
 libavcodec/xvmc.h | 174 --
 libavcodec/xvmc_internal.h|  38 -
 libavutil/pixdesc.c   |  10 --
 libavutil/pixfmt.h|   4 -
 libavutil/version.h   |   3 -
 tests/checkasm/blockdsp.c |   4 +-
 36 files changed, 25 insertions(+), 809 deletions(-)

diff --git a/configure b/configure
index 1c7887209e..366520cf96 100755
--- a/configure
+++ b/configure
@@ -2073,8 +2073,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"
@@ -4645,7 +4643,6 @@ check_header unistd.h
 check_header valgrind/valgrind.h
 check_header VideoDecodeAcceleration/VDADecoder.h
 check_header windows.h
-check_header X11/extensions/XvMClib.h
 
 # it seems there are versions of clang in some distros that try to use the
 # gcc headers, which explodes for stdatomic
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 28f839165e..b419bfa268 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -960,7 +960,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 }
 
 f->version = AV_RL32(avctx->extradata) >> 16;
-ff_blockdsp_init(&f->bdsp, avctx);
+ff_blockdsp_init(&f->bdsp);
 ff_bswapdsp_init(&f->bbdsp);
 f->avctx = avctx;
 init_vlcs(f);
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2b1e221248..3a55a28e27 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -13,7 +13,6 @@ HEADERS = avcodec.h   
  \
   vdpau.h   \
   version.h \
   vorbis_parser.h   \
-  xvmc.h\
 
 OBJS = allcodecs.o  \
avpacket.o   \
@@ -330,7 +329,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
@@ -791,7 +789,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 b9936c57f7..556bdb43f3 100644

[FFmpeg-cvslog] avcodec/libx264: add me_method alias to set X264Context->motion_est

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 14:34:15 
2017 -0300| [7bbe33b0526723f0a20c27e3b8d03b186b27fdf6] | committer: James Almer

avcodec/libx264: add me_method alias to set X264Context->motion_est

Replaces the now dropped global option.

Addresses ticket #6771.

Reviewed-by: Paul B Mahol 
Signed-off-by: James Almer 

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

 libavcodec/libx264.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index b11ede6198..b5e04d674d 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -958,6 +958,7 @@ static const AVOption options[] = {
 { "vbr",   NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_VBR},  
INT_MIN, INT_MAX, VE, "nal-hrd" },
 { "cbr",   NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_CBR},  
INT_MIN, INT_MAX, VE, "nal-hrd" },
 { "avcintra-class","AVC-Intra class 50/100/200",  
OFFSET(avcintra_class),AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 200   , VE},
+{ "me_method","Set motion estimation method", 
OFFSET(motion_est),AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, X264_ME_TESA, VE, 
"motion-est"},
 { "motion-est",   "Set motion estimation method", 
OFFSET(motion_est),AV_OPT_TYPE_INT,{ .i64 = -1 }, -1, X264_ME_TESA, VE, 
"motion-est"},
 { "dia",   NULL, 0, AV_OPT_TYPE_CONST, { .i64 = X264_ME_DIA },  
INT_MIN, INT_MAX, VE, "motion-est" },
 { "hex",   NULL, 0, AV_OPT_TYPE_CONST, { .i64 = X264_ME_HEX },  
INT_MIN, INT_MAX, VE, "motion-est" },

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '0871e2337777d9161e7f3554bcad19dabc9e15e1'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 15:04:19 
2017 -0300| [c381f6a483e00ab8bfa4f777284b89acdad6dd94] | committer: James Almer

Merge commit '0871e233d9161e7f3554bcad19dabc9e15e1'

* commit '0871e233d9161e7f3554bcad19dabc9e15e1':
  lavc: Drop deprecated architectures symbols

Merged-by: James Almer 

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

 libavcodec/alpha/idctdsp_alpha.c | 3 +--
 libavcodec/avcodec.h | 9 -
 libavcodec/avdct.c   | 6 --
 libavcodec/options_table.h   | 6 --
 libavcodec/version.h | 9 -
 5 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/libavcodec/alpha/idctdsp_alpha.c b/libavcodec/alpha/idctdsp_alpha.c
index 1923ebbc5f..bd43842535 100644
--- a/libavcodec/alpha/idctdsp_alpha.c
+++ b/libavcodec/alpha/idctdsp_alpha.c
@@ -118,8 +118,7 @@ av_cold void ff_idctdsp_init_alpha(IDCTDSPContext *c, 
AVCodecContext *avctx,
 add_pixels_clamped_axp_p = c->add_pixels_clamped;
 
 if (!high_bit_depth && !avctx->lowres &&
-(avctx->idct_algo == FF_IDCT_AUTO ||
- avctx->idct_algo == FF_IDCT_SIMPLEALPHA)) {
+(avctx->idct_algo == FF_IDCT_AUTO)) {
 c->idct_put = ff_simple_idct_put_axp;
 c->idct_add = ff_simple_idct_add_axp;
 c->idct = ff_simple_idct_axp;
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9581bffd20..c1090456f5 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3097,9 +3097,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
@@ -3110,14 +3107,8 @@ 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
-#if FF_API_ARCH_ALPHA
-#define FF_IDCT_SIMPLEALPHA   23
-#endif
 #define FF_IDCT_NONE  24 /* Used by XvMC to extract IDCT coefficients 
with FF_IDCT_PERM_NONE */
 #define FF_IDCT_SIMPLEAUTO128
 
diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c
index 80aca8872b..a9a43cc18a 100644
--- a/libavcodec/avdct.c
+++ b/libavcodec/avdct.c
@@ -48,16 +48,10 @@ static const AVOption avdct_options[] = {
 {"simplemmx", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"arm", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"altivec", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_ALTIVEC }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#if FF_API_ARCH_SH4
-{"sh4", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#endif
 {"simplearm", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SIMPLEARM }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv5te", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 
= FF_IDCT_SIMPLEARMV5TE }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv6", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SIMPLEARMV6 }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simpleneon", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SIMPLENEON }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#if FF_API_ARCH_ALPHA
-{"simplealpha", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#endif
 #if FF_API_UNUSED_MEMBERS
 {"ipp", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"},
 #endif
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 7a3e765d88..c40b3e61b4 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -219,16 +219,10 @@ 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"},
 {"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 =

[FFmpeg-cvslog] Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 15:11:42 
2017 -0300| [b46613dd9b8b4adc68312a283486c33c109aab19] | committer: James Almer

Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'

* commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198':
  lavc: Remove deprecated XvMC support hacks

Merged-by: James Almer 

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

 configure  |  2 --
 doc/codecs.texi|  2 --
 libavcodec/allcodecs.c |  3 ---
 libavcodec/avcodec.h   | 23 ---
 libavcodec/codec_desc.c|  9 -
 libavcodec/mpeg12dec.c | 43 ---
 libavcodec/options_table.h |  3 ---
 libavcodec/version.h   |  3 ---
 libavutil/pixdesc.c| 12 
 libavutil/pixfmt.h |  9 ++---
 libavutil/version.h|  3 ---
 11 files changed, 2 insertions(+), 110 deletions(-)

diff --git a/configure b/configure
index e487610c1a..2443986d21 100755
--- a/configure
+++ b/configure
@@ -2542,8 +2542,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"
 mpegvideo_decoder_select="mpegvideo"
 mpeg1video_decoder_select="mpegvideo"
 mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp"
diff --git a/doc/codecs.texi b/doc/codecs.texi
index 40f64fe4c8..6ab02c35de 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -757,8 +757,6 @@ Set context model.
 
 @item slice_flags @var{integer}
 
-@item xvmc_acceleration @var{integer}
-
 @item mbd @var{integer} (@emph{encoding,video})
 Set macroblock decision algorithm (high quality mode).
 
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 60b66d46b9..dea1b1d13b 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -250,9 +250,6 @@ static void 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_ENCDEC (MPEG4, mpeg4);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c1090456f5..9d2127b21d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -217,9 +217,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,
@@ -1170,16 +1167,6 @@ typedef struct RcOverride{
  */
 #define CODEC_CAP_DR1 AV_CODEC_CAP_DR1
 #define CODEC_CAP_TRUNCATED   AV_CODEC_CAP_TRUNCATED
-#if FF_API_XVMC
-/* Codec can export data for HW decoding. This flag indicates that
- * the codec would call get_format() with list that might contain HW 
accelerated
- * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of 
them
- * including raw image format.
- * The application can use the passed context to determine bitstream version,
- * chroma format, resolution etc.
- */
-#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.
@@ -2284,16 +2271,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
- * - encoding: forbidden
- * - decoding: set by decoder
- * @deprecated XvMC doesn't need it anymore.
- */
-attribute_deprecated int xvmc_acceleration;
-#endif /* FF_API_XVMC */
-
 /**
  * macroblock decision mode
  * - encoding: Set by user.
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 669d2458c9..92bf1d2681 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -46,15 +46,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
 .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
 .profiles  = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles),
 },
-#if FF_API_XVMC
-{
-.id= AV_CODEC_ID_MPEG2VIDEO_XVMC,
-.type  = AVMEDIA_TYPE_VIDEO,
-.name  = "mpegvideo_xvmc",
-.long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion 
Compensation)"),
-.props = AV_CODEC_PROP_LOSSY,
-},
-#endif /* FF_API_XVMC */
 

[FFmpeg-cvslog] Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 15:02:25 
2017 -0300| [b13e61d6296e4f91f1f495ff436c61ad5de323fb] | committer: James Almer

Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'

* commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458':
  lavc: Drop deprecated extended aspect ratio symbol

Merged-by: James Almer 

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

 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 5f124a0c24..9581bffd20 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1944,10 +1944,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 d154d36632..f891f72379 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -27,9 +27,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 cf24b41331..59f8d3c7cd 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_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


==

diff --cc libavcodec/version.h
index cf24b41331,bc8bdad0f4..59f8d3c7cd
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,21 -45,8 +45,18 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the 
change.
   */
  
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
 +#ifndef FF_API_DEBUG_MV
 +#define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
- #ifndef FF_API_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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 15:50:46 
2017 -0300| [400ecd8e4059e0d6c587915bca5e7e11858cca33] | committer: James Almer

Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'

* commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc':
  lavc: Drop deprecated error rate option

Merged-by: James Almer 

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

 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 9d2127b21d..8b32ed7e77 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3336,15 +3336,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 5765ef339f..68e1996687 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1069,13 +1069,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 6e90c0d77c..68dce2a930 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -348,9 +348,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", "set the number of threads", OFFSET(thread_count), 
AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|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 3c9356d8ce..b0a90b8d19 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_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


==

diff --cc libavcodec/mpegvideo_enc.c
index 5765ef339f,4d72c01ec9..68e1996687
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@@ -1053,29 -874,6 +1053,22 @@@ FF_ENABLE_DEPRECATION_WARNING
  if (ff_rate_control_init(s) < 0)
  return -1;
  
 +#if FF_API_RC_STRATEGY
 +av_assert0(MPV_RC_STRATEGY_XVID == FF_RC_STRATEGY_XVID);
 +#endif
 +
 +if ((s->avctx->flags & AV_CODEC_FLAG_PASS2) && s->rc_strategy == 
MPV_RC_STRATEGY_XVID) {
 +#if CONFIG_LIBXVID
 +ret = ff_xvid_rate_control_init(s);
 +#else
 +ret = AVERROR(ENOSYS);
 +av_log(s->avctx, AV_LOG_ERROR,
 +   "Xvid ratecontrol requires libavcodec compiled with Xvid 
support.\n");
 +#endif
 +if (ret < 0)
 +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 --cc libavcodec/options_table.h
index 6e90c0d77c,7531af0471..68dce2a930
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@@ -348,10 -313,7 +348,7 @@@ 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(t

[FFmpeg-cvslog] lavc: Drop deprecated error rate option

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:41:20 2016 -0500| [72dc7ddd18fe54ee68aec71590c3202ad009a8fc] | 
committer: Vittorio Giovara

lavc: Drop deprecated error rate option

Deprecated in 10/2013.

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

 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 8567c8b28f..f596ad3051 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2958,15 +2958,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 40c044d703..4d72c01ec9 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -874,13 +874,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 if (ff_rate_control_init(s) < 0)
 return -1;
 
-#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 5e3540d2dd..7531af0471 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -313,9 +313,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 986e697bc9..cfed83160f 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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: Drop deprecated public symbols

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:42:00 2016 -0500| [cbebc3251bc2544b469e0dcb176bc04779d8866c] | 
committer: Vittorio Giovara

lavc: Drop deprecated public symbols

qscale types and maximum number of bframes deprecated in 10/2013.
Negative linesizes deprecated in 11/2013.
xvidmmx deprecated in 08/2014.

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

 libavcodec/avcodec.h   | 23 ---
 libavcodec/options_table.h |  3 ---
 libavcodec/version.h   | 12 
 3 files changed, 38 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f596ad3051..6311acf628 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -730,13 +730,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.
@@ -1057,12 +1050,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.
  */
@@ -1178,13 +1165,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.
  */
@@ -2722,9 +2702,6 @@ typedef struct AVCodecContext {
 #define FF_IDCT_IPP   13
 #endif /* FF_API_UNUSED_MEMBERS */
 #define FF_IDCT_XVID  14
-#if FF_API_IDCT_XVIDMMX
-#define FF_IDCT_XVIDMMX   14
-#endif /* FF_API_IDCT_XVIDMMX */
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6   17
 #define FF_IDCT_FAAN  20
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 7531af0471..c95e55265f 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -213,9 +213,6 @@ static const AVOption avcodec_options[] = {
 {"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"},
-#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 cfed83160f..db14d7bf97 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,30 +47,18 @@
  * 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
-#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
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_EMU_EDGE
 #define FF_API_EMU_EDGE  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
 #ifndef FF_API_UNUSED_MEMBERS
 #define FF_API_UNUSED_MEMBERS(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_IDCT_XVIDMMX
-#define FF_API_IDCT_XVIDMMX  (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_INPUT_PRESERVED
 #define FF_API_INPUT_PRESERVED   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 15:56:29 
2017 -0300| [0b79fdeb9a81b8a568c7efea1063352338f4aa5b] | committer: James Almer

Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'

* commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c':
  lavc: Drop deprecated public symbols

Merged-by: James Almer 

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

 libavcodec/avcodec.h  | 23 ---
 libavcodec/internal.h |  2 --
 libavcodec/version.h  | 12 
 3 files changed, 37 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8b32ed7e77..62775edb76 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -844,13 +844,6 @@ typedef struct RcOverride{
 float quality_factor;
 } RcOverride;
 
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
-#define FF_MAX_B_FRAMES 16
-#endif
-
 /* encoding support
These flags can be passed in AVCodecContext.flags before initialization.
Note: Not everything is supported yet.
@@ -1218,12 +1211,6 @@ typedef struct RcOverride{
  * Codec should fill in channel configuration and samplerate instead of 
container
  */
 #define CODEC_CAP_CHANNEL_CONF AV_CODEC_CAP_CHANNEL_CONF
-#if FF_API_NEG_LINESIZES
-/**
- * @deprecated no codecs use this capability
- */
-#define CODEC_CAP_NEG_LINESIZES0x0800
-#endif
 /**
  * Codec supports frame-level multithreading.
  */
@@ -1353,13 +1340,6 @@ typedef struct AVCPBProperties {
 uint64_t vbv_delay;
 } AVCPBProperties;
 
-#if FF_API_QSCALE_TYPE
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264  2
-#define FF_QSCALE_TYPE_VP56  3
-#endif
-
 /**
  * The decoder will keep a reference to the frame and may reuse it later.
  */
@@ -3079,9 +3059,6 @@ typedef struct AVCodecContext {
 #define FF_IDCT_IPP   13
 #endif /* FF_API_UNUSED_MEMBERS */
 #define FF_IDCT_XVID  14
-#if FF_API_IDCT_XVIDMMX
-#define FF_IDCT_XVIDMMX   14
-#endif /* FF_API_IDCT_XVIDMMX */
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6   17
 #define FF_IDCT_FAAN  20
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index f1d520237a..e9aad91704 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -80,12 +80,10 @@
 #define FF_DEFAULT_QUANT_BIAS 99
 #endif
 
-#if !FF_API_QSCALE_TYPE
 #define FF_QSCALE_TYPE_MPEG1 0
 #define FF_QSCALE_TYPE_MPEG2 1
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
-#endif
 
 #define FF_SANE_NB_CHANNELS 64U
 
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b0a90b8d19..4cfc66da0b 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,27 +57,15 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_QSCALE_TYPE
-#define FF_API_QSCALE_TYPE   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_MB_TYPE
 #define FF_API_MB_TYPE   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_EMU_EDGE
 #define FF_API_EMU_EDGE  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
 #ifndef FF_API_UNUSED_MEMBERS
 #define FF_API_UNUSED_MEMBERS(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_IDCT_XVIDMMX
-#define FF_API_IDCT_XVIDMMX  (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_INPUT_PRESERVED
 #define FF_API_INPUT_PRESERVED   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif


==

diff --cc libavcodec/avcodec.h
index 8b32ed7e77,6311acf628..62775edb76
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -1217,13 -1049,7 +1210,7 @@@ typedef struct RcOverride
  /**
   * Codec should fill in channel configuration and samplerate instead of 
container
   */
 -#define CODEC_CAP_CHANNEL_CONF 0x0400
 +#define CODEC_CAP_CHANNEL_CONF AV_CODEC_CAP_CHANNEL_CONF
- #if FF_API_NEG_LINESIZES
- /**
-  * @deprecated no codecs use this capability
-  */
- #define CODEC_CAP_NEG_LINESIZES0x0800
- #endif
  /**
   * Codec supports frame-level multithreading.
   */
diff --cc libavcodec/internal.h
index f1d520237a,5b82504bfb..e9aad91704
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@@ -80,24 -77,9 +80,22 @@@
  #define FF_DEFAULT_QUANT_BIAS 99
  #endif
  
- #if !FF_API_QSCALE_TYPE
 -#define FF_SANE_NB_CHANNELS 63U
 +#define FF_QSCALE_TYPE_MPEG1 0
 +#define FF_QSCALE_TYPE_MPEG2 1
 +#define FF_QSCALE_TYPE_H264  2
 +#define FF_QSCALE_TYPE_VP56  3
- #endif
  
 -#define FF_SIGNBIT(x) (x >> CHAR_BIT * sizeof(x) - 1)
 +#define FF_SANE_NB_CHANNELS 64U
 +
 +#define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)
 +
 +#if HAVE_SIMD_ALIGN_32
 +#   define STRIDE_ALIGN 32
 +#elif HAVE

[FFmpeg-cvslog] lavc: Drop deprecated macroblock type symbols

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:43:14 2016 -0500| [da5ba26b9e25f408e8d2f9428c9eca699f11a7db] | 
committer: Vittorio Giovara

lavc: Drop deprecated macroblock type symbols

Deprecated in 10/2013.

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

 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 6311acf628..6fd76b5329 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1072,32 +1072,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 60f971222e..960999c928 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 db14d7bf97..da2d5e5328 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_FAST_MALLOC
 #define FF_API_FAST_MALLOC   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 15:59:02 
2017 -0300| [f7eb1c9ac55bd27583419fb09c3dbb70b3ce56bc] | committer: James Almer

Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'

* commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db':
  lavc: Drop deprecated macroblock type symbols

Merged-by: James Almer 

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

 libavcodec/avcodec.h   | 26 --
 libavcodec/mpegutils.h |  2 --
 libavcodec/version.h   |  3 ---
 3 files changed, 31 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 62775edb76..5a07aad5a9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1247,32 +1247,6 @@ typedef struct RcOverride{
 #define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
 #endif /* FF_API_WITHOUT_PREFIX */
 
-#if FF_API_MB_TYPE
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4   0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16  0x0008
-#define MB_TYPE_16x8   0x0010
-#define MB_TYPE_8x16   0x0020
-#define MB_TYPE_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 9cfadfc4cf..1bf73fea02 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 4cfc66da0b..4565cd5aac 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_MB_TYPE
-#define FF_API_MB_TYPE   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_EMU_EDGE
 #define FF_API_EMU_EDGE  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif


==

diff --cc libavcodec/avcodec.h
index 62775edb76,6fd76b5329..5a07aad5a9
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -1230,49 -1069,9 +1230,23 @@@ typedef struct RcOverride
  /**
   * Audio encoder supports receiving a different number of samples in each 
call.
   */
 -#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x1
 +#define CODEC_CAP_VARIABLE_FRAME_SIZE AV_CODEC_CAP_VARIABLE_FRAME_SIZE
 +/**
 + * Codec is intra only.
 + */
 +#define CODEC_CAP_INTRA_ONLY   AV_CODEC_CAP_INTRA_ONLY
 +/**
 + * Codec is lossless.
 + */
 +#define CODEC_CAP_LOSSLESS AV_CODEC_CAP_LOSSLESS
 +
 +/**
 + * HWAccel is experimental and is thus avoided in favor of non experimental
 + * codecs
 + */
 +#define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
  #endif /* FF_API_WITHOUT_PREFIX */
  
- #if FF_API_MB_TYPE
- //The following defines may change, don't expect compatibility if you use 
them.
- #define MB_TYPE_INTRA4x4   0x0001
- #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
- #define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
- #define MB_TYPE_16x16  0x0008
- #define MB_TYPE_16x8   0x0010
- #define MB_TYPE_8x16   0x0020
- #define MB_TYPE_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

[FFmpeg-cvslog] lavc: Drop deprecated av_fast_malloc() compatibility

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:45:20 2016 -0500| [06c20d3e32c33c4da6d9fbc43aebaeb38c45b859] | 
committer: Vittorio Giovara

lavc: Drop deprecated av_fast_malloc() compatibility

Deprecated in 10/2013.

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

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6fd76b5329..86632f28b8 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 da2d5e5328..3fca559fc0 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_EMU_EDGE
 #define FF_API_EMU_EDGE  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:00:30 
2017 -0300| [d658e04337c590043190718ec4a8137d3e8216b9] | committer: James Almer

Merge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859'

* commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859':
  lavc: Drop deprecated av_fast_malloc() compatibility

This commit is a noop.

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: Drop deprecated emu edge functionality

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:47:35 2016 -0500| [b3739599bda740ac12d3dde31a331b744df99123] | 
committer: Vittorio Giovara

lavc: Drop deprecated emu edge functionality

Deprecated in 01/2014.

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

 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 86632f28b8..a5f0dade72 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -947,13 +947,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. */
@@ -4025,21 +4018,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 c95e55265f..ebd77d4c80 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 6cef65083d..61bb09b031 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -118,13 +118,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 3fca559fc0..cafc6e8ba0 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_UNUSED_MEMBERS
 #define FF_API_UNUSED_MEMBERS(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '302554835e39b79b977ed60c9afe81b44590dfef'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:08:42 
2017 -0300| [6e69525e6984d51165de0b17b796bbc29f9dd6e7] | committer: James Almer

Merge commit '302554835e39b79b977ed60c9afe81b44590dfef'

* commit '302554835e39b79b977ed60c9afe81b44590dfef':
  lavc: Drop deprecated unused public members

Merged-by: James Almer 

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

 libavcodec/avcodec.h   | 18 --
 libavcodec/avdct.c |  3 ---
 libavcodec/options_table.h | 12 
 libavcodec/version.h   |  3 ---
 4 files changed, 36 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3b68de6986..6ce315c2eb 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2349,15 +2349,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.
@@ -2707,9 +2698,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
  */
@@ -2911,9 +2899,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
@@ -3022,9 +3007,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
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6   17
diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c
index a9a43cc18a..860f86595d 100644
--- a/libavcodec/avdct.c
+++ b/libavcodec/avdct.c
@@ -52,9 +52,6 @@ static const AVOption avdct_options[] = {
 {"simplearmv5te", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 
= FF_IDCT_SIMPLEARMV5TE }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv6", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SIMPLEARMV6 }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simpleneon", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_SIMPLENEON }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#if FF_API_UNUSED_MEMBERS
-{"ipp", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#endif
 {"xvid", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"xvidmmx", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"faani", "floating point AAN IDCT (experimental / for debugging)", 0, 
AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 944c6c4f85..ca2132cb3e 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -220,9 +220,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"},
 {"xvidmmx", "deprecated, for compatibility only", 0, AV_OPT_TYPE_CONST, {.i64 
= FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
@@ -254,9 +251,6 @@ static const AVOption avcodec_options[] = {
 {"green_metadata", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_GREEN_MD }, 
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_

[FFmpeg-cvslog] lavc: Drop deprecated unused public members

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:55:32 2016 -0500| [302554835e39b79b977ed60c9afe81b44590dfef] | 
committer: Vittorio Giovara

lavc: Drop deprecated unused public members

Deprecated in 07/2014.

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

 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 a5f0dade72..f8ab537104 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2023,15 +2023,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.
@@ -2377,9 +2368,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
  */
@@ -2573,9 +2561,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
@@ -2660,9 +2645,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
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6   17
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index ebd77d4c80..e29440e597 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"},
 {"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},
@@ -232,9 +229,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"},
@@ -280,9 +274,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},
@@ -370,9 +361,6 @@ static const AVOption avcodec_options[] = {
 {"chromaoffset", "chroma QP offset from luma", OFFSET(chromaoffset), 

[FFmpeg-cvslog] Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:19:38 
2017 -0300| [b79a7da36faa6bb5914b04800b548e99eb3b81ca] | committer: James Almer

Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'

* commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940':
  lavc: Drop deprecated codec flags

Merged-by: James Almer 

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

 libavcodec/avcodec.h   | 177 -
 libavcodec/libxvid.c   |   5 --
 libavcodec/mpegvideo_enc.c |  14 
 libavcodec/options_table.h |  12 ---
 libavcodec/version.h   |  15 
 5 files changed, 223 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6ce315c2eb..1f76833f0e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -774,18 +774,6 @@ typedef struct AVCodecDescriptor {
  */
 #define AV_INPUT_BUFFER_MIN_SIZE 16384
 
-#if FF_API_WITHOUT_PREFIX
-/**
- * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 32
-
-/**
- * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead
- */
-#define FF_MIN_BUFFER_SIZE 16384
-#endif /* FF_API_WITHOUT_PREFIX */
-
 /**
  * @ingroup lavc_encoding
  * motion estimation type.
@@ -1075,171 +1063,6 @@ typedef struct RcOverride{
  */
 #define AV_CODEC_CAP_LOSSLESS 0x8000
 
-
-#if FF_API_WITHOUT_PREFIX
-/**
- * Allow decoders to produce frames with data planes that are not aligned
- * to CPU requirements (e.g. due to cropping).
- */
-#define CODEC_FLAG_UNALIGNED AV_CODEC_FLAG_UNALIGNED
-#define CODEC_FLAG_QSCALE AV_CODEC_FLAG_QSCALE
-#define CODEC_FLAG_4MVAV_CODEC_FLAG_4MV
-#define CODEC_FLAG_OUTPUT_CORRUPT AV_CODEC_FLAG_OUTPUT_CORRUPT
-#define CODEC_FLAG_QPEL   AV_CODEC_FLAG_QPEL
-#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
- * mpegvideo encoders
- */
-#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   AV_CODEC_FLAG_PASS1
-#define CODEC_FLAG_PASS2   AV_CODEC_FLAG_PASS2
-#define CODEC_FLAG_GRAYAV_CODEC_FLAG_GRAY
-#define CODEC_FLAG_PSNRAV_CODEC_FLAG_PSNR
-#define CODEC_FLAG_TRUNCATED   AV_CODEC_FLAG_TRUNCATED
-
-#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 AV_CODEC_FLAG_INTERLACED_DCT
-#define CODEC_FLAG_LOW_DELAY  AV_CODEC_FLAG_LOW_DELAY
-#define CODEC_FLAG_GLOBAL_HEADER  AV_CODEC_FLAG_GLOBAL_HEADER
-#define CODEC_FLAG_BITEXACT   AV_CODEC_FLAG_BITEXACT
-#define CODEC_FLAG_AC_PREDAV_CODEC_FLAG_AC_PRED
-#define CODEC_FLAG_LOOP_FILTERAV_CODEC_FLAG_LOOP_FILTER
-#define CODEC_FLAG_INTERLACED_ME  AV_CODEC_FLAG_INTERLACED_ME
-#define CODEC_FLAG_CLOSED_GOP AV_CODEC_FLAG_CLOSED_GOP
-#define CODEC_FLAG2_FAST  AV_CODEC_FLAG2_FAST
-#define CODEC_FLAG2_NO_OUTPUT AV_CODEC_FLAG2_NO_OUTPUT
-#define CODEC_FLAG2_LOCAL_HEADER  AV_CODEC_FLAG2_LOCAL_HEADER
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE AV_CODEC_FLAG2_DROP_FRAME_TIMECODE
-#define CODEC_FLAG2_IGNORE_CROP   AV_CODEC_FLAG2_IGNORE_CROP
-
-#define CODEC_FLAG2_CHUNKSAV_CODEC_FLAG2_CHUNKS
-#define CODEC_FLAG2_SHOW_ALL  AV_CODEC_FLAG2_SHOW_ALL
-#define CODEC_FLAG2_EXPORT_MVSAV_CODEC_FLAG2_EXPORT_MVS
-#define CODEC_FLAG2_SKIP_MANUAL   AV_CODEC_FLAG2_SKIP_MANUAL
-
-/* Unsupported options :
- *  Syntax Arithmetic coding (SAC)
- *  Reference Picture Selection
- *  Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND AV_CODEC_CAP_DRAW_HORIZ_BAND ///< Decoder 
can use draw_horiz_band callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom 
allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1 AV_CODEC_CAP_DR1
-#define CODEC_CAP_TRUNCATED   AV_CODEC_CAP_TRUNCATED
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and correct output.
- *
- * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
- *   with NULL data. The user can still send NULL data to the public encode
- *   or decode function, but libavcodec will not pass it along to the codec
- *   unless this flag is set.
- *
- * Decoders:
- * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
- * avpkt->size=

[FFmpeg-cvslog] lavc: Drop deprecated codec flags

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 15:57:18 2016 -0500| [bb45d11282d93af0e8d4c8fd6bc6405f7439a940] | 
committer: Vittorio Giovara

lavc: Drop deprecated codec flags

Deprecated between 04/2014 - 05/2015.

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

 libavcodec/avcodec.h   | 158 -
 libavcodec/libxvid.c   |   6 --
 libavcodec/mpegvideo_enc.c |  14 
 libavcodec/options_table.h |  12 
 libavcodec/version.h   |  15 -
 5 files changed, 205 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f8ab537104..f7c879604e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -657,18 +657,6 @@ typedef struct AVCodecDescriptor {
  */
 #define AV_INPUT_BUFFER_MIN_SIZE 16384
 
-#if FF_API_WITHOUT_PREFIX
-/**
- * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
-
-/**
- * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead
- */
-#define FF_MIN_BUFFER_SIZE 16384
-#endif /* FF_API_WITHOUT_PREFIX */
-
 /**
  * @ingroup lavc_encoding
  * motion estimation type.
@@ -914,152 +902,6 @@ typedef struct RcOverride{
  */
 #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
 
-#if FF_API_WITHOUT_PREFIX
-/**
- * Allow decoders to produce frames with data planes that are not aligned
- * to CPU requirements (e.g. due to cropping).
- */
-#define CODEC_FLAG_UNALIGNED 0x0001
-#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
-#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
- * mpegvideo encoders
- */
-#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.
-#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.
-#define CODEC_FLAG_BITEXACT   0x0080 ///< Use only bitexact stuff 
(except (I)DCT).
-/* Fx : Flag for H.263+ extra options */
-#define CODEC_FLAG_AC_PRED0x0100 ///< H.263 advanced intra coding 
/ MPEG-4 AC prediction
-#define CODEC_FLAG_LOOP_FILTER0x0800 ///< loop filter
-#define CODEC_FLAG_INTERLACED_ME  0x2000 ///< interlaced motion estimation
-#define CODEC_FLAG_CLOSED_GOP 0x8000
-#define CODEC_FLAG2_FAST  0x0001 ///< Allow non spec compliant 
speedup tricks.
-#define CODEC_FLAG2_NO_OUTPUT 0x0004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER  0x0008 ///< Place global headers at 
every keyframe instead of in extradata.
-#define CODEC_FLAG2_IGNORE_CROP   0x0001 ///< Discard cropping information 
from SPS.
-
-#define CODEC_FLAG2_CHUNKS0x8000 ///< Input bitstream might be 
truncated at a packet boundaries instead of only at frame boundaries.
-
-/* Unsupported options :
- *  Syntax Arithmetic coding (SAC)
- *  Reference Picture Selection
- *  Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band 
callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom 
allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1 0x0002
-#define CODEC_CAP_TRUNCATED   0x0008
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and cor

[FFmpeg-cvslog] lavc: Drop deprecated avctx codec name

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 17:08:15 2016 -0500| [4476027d93680cd88d2f75ef1cef5b0c276a8704] | 
committer: Vittorio Giovara

lavc: Drop deprecated avctx codec name

Deprecated in 04/2014.

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

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f7c879604e..e1f5d8ff6e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1219,13 +1219,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 04f701430e..99aa9bf8cc 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 < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:28:38 
2017 -0300| [5a2e581879b8901b8660b82ff8d333d18fc629ff] | committer: James Almer

Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'

* commit '4476027d93680cd88d2f75ef1cef5b0c276a8704':
  lavc: Drop deprecated avctx codec name

Merged-by: James Almer 

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

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1f76833f0e..9448075af2 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1507,13 +1507,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 e0be3d5021..3ad0db30ca 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_CODEC_NAME
-#define FF_API_CODEC_NAME(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_AFD
 #define FF_API_AFD   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif


==

diff --cc libavcodec/version.h
index e0be3d5021,99aa9bf8cc..3ad0db30ca
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,21 -45,8 +45,18 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the 
change.
   */
  
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
 +#ifndef FF_API_DEBUG_MV
 +#define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
- #ifndef FF_API_CODEC_NAME
- #define FF_API_CODEC_NAME(LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
  #ifndef FF_API_AFD
  #define FF_API_AFD   (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:31:50 
2017 -0300| [2ccd00dabd5ab4fa2550377be823a521df80c141] | committer: James Almer

Merge commit '5182a28b5de060c51c21b36053ab205bfe31'

* commit '5182a28b5de060c51c21b36053ab205bfe31':
  lavc: Drop deprecated global afd field

Merged-by: James Almer 

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

 libavcodec/avcodec.h   | 20 
 libavcodec/h264dec.c   |  5 -
 libavcodec/mpeg12dec.c |  5 -
 libavcodec/options_table.h |  3 ---
 libavcodec/pthread_frame.c |  5 -
 libavcodec/version.h   |  3 ---
 6 files changed, 41 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9448075af2..c80b306e89 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1982,26 +1982,6 @@ typedef struct AVCodecContext {
  */
 int me_subpel_quality;
 
-#if FF_API_AFD
-/**
- * DTG active format information (additional aspect ratio
- * information only used in DVB MPEG-2 transport streams)
- * 0 if not set.
- *
- * - encoding: unused
- * - decoding: Set by decoder.
- * @deprecated Deprecated in favor of AVSideData
- */
-attribute_deprecated int dtg_active_format;
-#define FF_DTG_AFD_SAME 8
-#define FF_DTG_AFD_4_3  9
-#define FF_DTG_AFD_16_9 10
-#define FF_DTG_AFD_14_9 11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3   15
-#endif /* FF_API_AFD */
-
 /**
  * maximum motion estimation search range in subpel units
  * If 0 then no limit.
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index b11a5ea636..5abaaabf9d 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -707,11 +707,6 @@ static int decode_nal_units(H264Context *h, const uint8_t 
*buf, int buf_size)
 h->has_recovery_point = h->has_recovery_point || 
h->sei.recovery_point.recovery_frame_cnt != -1;
 if (avctx->debug & FF_DEBUG_GREEN_MD)
 debug_green_metadata(&h->sei.green_metadata, h->avctx);
-#if FF_API_AFD
-FF_DISABLE_DEPRECATION_WARNINGS
-h->avctx->dtg_active_format = h->sei.afd.active_format_description;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif /* FF_API_AFD */
 if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
 goto end;
 break;
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 97885c0be8..f102246f52 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2351,11 +2351,6 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
 if (flags & 0x40) {
 if (buf_end - p < 1)
 return;
-#if FF_API_AFD
-FF_DISABLE_DEPRECATION_WARNINGS
-avctx->dtg_active_format = p[0] & 0x0f;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif /* FF_API_AFD */
 s1->has_afd = 1;
 s1->afd = p[0] & 0x0f;
 }
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index c020d41930..51932f857d 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -285,9 +285,6 @@ static const AVOption avcodec_options[] = {
 {"msad", "sum of absolute differences, median predicted", 0, 
AV_OPT_TYPE_CONST, {.i64 = FF_CMP_MEDIAN_SAD }, INT_MIN, INT_MAX, V|E, 
"cmp_func"},
 {"pre_dia_size", "diamond type & size for motion estimation pre-pass", 
OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, 
V|E},
 {"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), 
AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E},
-#if FF_API_AFD
-{"dtg_active_format", NULL, OFFSET(dtg_active_format), AV_OPT_TYPE_INT, {.i64 
= DEFAULT }, INT_MIN, INT_MAX},
-#endif
 {"me_range", "limit motion vectors range (1023 for DivX player)", 
OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #if FF_API_QUANT_BIAS
 {"ibias", "intra quant bias", OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 
= FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E},
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 2c702c7372..ddfd07d292 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -262,11 +262,6 @@ static int update_context_from_thread(AVCodecContext *dst, 
AVCodecContext *src,
 
 dst->bits_per_coded_sample = src->bits_per_coded_sample;
 dst->sample_aspect_ratio   = src->sample_aspect_ratio;
-#if FF_API_AFD
-FF_DISABLE_DEPRECATION_WARNINGS
-dst->dtg_active_format = src->dtg_active_format;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif /* FF_API_AFD */
 
 dst->profile = src->profile;
 dst->level   = src->level;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3ad0db30ca..aa2e6a173f 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_M

[FFmpeg-cvslog] lavc: Drop deprecated global afd field

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Thu 
Mar 16 15:51:56 2017 -0400| [5182a28b5de060c51c21b36053ab205bfe31] | 
committer: Vittorio Giovara

lavc: Drop deprecated global afd field

Deprecated in 08/2014.

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

 libavcodec/avcodec.h   | 20 
 libavcodec/mpeg12dec.c |  5 -
 libavcodec/options_table.h |  3 ---
 libavcodec/pthread_frame.c |  5 -
 libavcodec/version.h   |  3 ---
 5 files changed, 36 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e1f5d8ff6e..2366acf93c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1675,26 +1675,6 @@ typedef struct AVCodecContext {
  */
 int me_subpel_quality;
 
-#if FF_API_AFD
-/**
- * DTG active format information (additional aspect ratio
- * information only used in DVB MPEG-2 transport streams)
- * 0 if not set.
- *
- * - encoding: unused
- * - decoding: Set by decoder.
- * @deprecated Deprecated in favor of AVSideData
- */
-attribute_deprecated int dtg_active_format;
-#define FF_DTG_AFD_SAME 8
-#define FF_DTG_AFD_4_3  9
-#define FF_DTG_AFD_16_9 10
-#define FF_DTG_AFD_14_9 11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3   15
-#endif /* FF_API_AFD */
-
 /**
  * maximum motion estimation search range in subpel units
  * If 0 then no limit.
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 528a4ed16d..6702ad1ed7 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2176,11 +2176,6 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
 if (flags & 0x40) {
 if (buf_end - p < 1)
 return;
-#if FF_API_AFD
-FF_DISABLE_DEPRECATION_WARNINGS
-avctx->dtg_active_format = p[0] & 0x0f;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif /* FF_API_AFD */
 s1->has_afd = 1;
 s1->afd = p[0] & 0x0f;
 }
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 1d15422a11..7a8ef3d4a9 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -247,9 +247,6 @@ static const AVOption avcodec_options[] = {
 {"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, 
INT_MAX, V|E, "cmp_func"},
 {"pre_dia_size", "diamond type & size for motion estimation pre-pass", 
OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, 
V|E},
 {"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), 
AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E},
-#if FF_API_AFD
-{"dtg_active_format", NULL, OFFSET(dtg_active_format), AV_OPT_TYPE_INT, {.i64 
= DEFAULT }, INT_MIN, INT_MAX},
-#endif
 {"me_range", "limit motion vectors range (1023 for DivX player)", 
OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #if FF_API_QUANT_BIAS
 {"ibias", "intra quant bias", OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 
= FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E},
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 65a04d8e90..6d14a878a4 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -238,11 +238,6 @@ static int update_context_from_thread(AVCodecContext *dst, 
AVCodecContext *src,
 
 dst->bits_per_coded_sample = src->bits_per_coded_sample;
 dst->sample_aspect_ratio   = src->sample_aspect_ratio;
-#if FF_API_AFD
-FF_DISABLE_DEPRECATION_WARNINGS
-dst->dtg_active_format = src->dtg_active_format;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif /* FF_API_AFD */
 
 dst->profile = src->profile;
 dst->level   = src->level;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 99aa9bf8cc..45c2dbd560 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_AFD
-#define FF_API_AFD   (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_AUDIOENC_DELAY
 #define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: Drop deprecated way of setting audio delay on encode

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Thu 
Mar 16 15:55:18 2017 -0400| [48bb0da050329e5111b00a12dfc154b7e78fb3a3] | 
committer: Vittorio Giovara

lavc: Drop deprecated way of setting audio delay on encode

Deprecated in 08/2014.

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

 libavcodec/encode.c  | 4 
 libavcodec/utils.c   | 5 -
 libavcodec/version.h | 3 ---
 3 files changed, 12 deletions(-)

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index fc27a070e1..9bb7ae5bde 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -194,10 +194,6 @@ int attribute_align_arg 
avcodec_encode_audio2(AVCodecContext *avctx,
 end:
 av_frame_free(&padded_frame);
 
-#if FF_API_AUDIOENC_DELAY
-avctx->delay = avctx->initial_padding;
-#endif
-
 return ret;
 }
 
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 61bb09b031..a6408cecbb 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -646,11 +646,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 }
 }
 
-#if FF_API_AUDIOENC_DELAY
-if (av_codec_is_encoder(avctx->codec))
-avctx->delay = avctx->initial_padding;
-#endif
-
 if (av_codec_is_decoder(avctx->codec)) {
 /* validate channel layout from the decoder */
 if (avctx->channel_layout) {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 45c2dbd560..b60e9715aa 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_AUDIOENC_DELAY
-#define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_AVCTX_TIMEBASE
 #define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:37:30 
2017 -0300| [d2484639bc205112f3841b14424b7744a92fd5e1] | committer: James Almer

Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'

* commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3':
  lavc: Drop deprecated way of setting audio delay on encode

Merged-by: James Almer 

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

 libavcodec/encode.c  | 4 
 libavcodec/utils.c   | 5 -
 libavcodec/version.h | 3 ---
 3 files changed, 12 deletions(-)

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index c961dbace1..71b1b14afc 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -257,10 +257,6 @@ end:
 av_frame_free(&padded_frame);
 av_free(extended_frame);
 
-#if FF_API_AUDIOENC_DELAY
-avctx->delay = avctx->initial_padding;
-#endif
-
 return ret;
 }
 
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index caf988ee4e..6f6707a7c7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1008,11 +1008,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
 ret=0;
 
-#if FF_API_AUDIOENC_DELAY
-if (av_codec_is_encoder(avctx->codec))
-avctx->delay = avctx->initial_padding;
-#endif
-
 if (av_codec_is_decoder(avctx->codec)) {
 if (!avctx->bit_rate)
 avctx->bit_rate = get_bit_rate(avctx);
diff --git a/libavcodec/version.h b/libavcodec/version.h
index aa2e6a173f..3dd58c448d 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -61,9 +61,6 @@
 /* XXX: don't forget to drop the -vismv documentation */
 #define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_AUDIOENC_DELAY
-#define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_VAAPI_CONTEXT
 #define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif


==

diff --cc libavcodec/encode.c
index c961dbace1,9bb7ae5bde..71b1b14afc
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@@ -255,12 -193,7 +255,8 @@@ int attribute_align_arg avcodec_encode_
  
  end:
  av_frame_free(&padded_frame);
 +av_free(extended_frame);
  
- #if FF_API_AUDIOENC_DELAY
- avctx->delay = avctx->initial_padding;
- #endif
- 
  return ret;
  }
  
diff --cc libavcodec/utils.c
index caf988ee4e,a6408cecbb..6f6707a7c7
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -1006,16 -646,7 +1006,11 @@@ FF_ENABLE_DEPRECATION_WARNING
  }
  }
  
 +ret=0;
 +
- #if FF_API_AUDIOENC_DELAY
- if (av_codec_is_encoder(avctx->codec))
- avctx->delay = avctx->initial_padding;
- #endif
- 
  if (av_codec_is_decoder(avctx->codec)) {
 +if (!avctx->bit_rate)
 +avctx->bit_rate = get_bit_rate(avctx);
  /* validate channel layout from the decoder */
  if (avctx->channel_layout) {
  int channels = 
av_get_channel_layout_nb_channels(avctx->channel_layout);
diff --cc libavcodec/version.h
index aa2e6a173f,b60e9715aa..3dd58c448d
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,30 -45,10 +45,27 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the 
change.
   */
  
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
 +#ifndef FF_API_DEBUG_MV
 +#define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
 +#ifndef FF_API_VISMV
 +/* XXX: don't forget to drop the -vismv documentation */
 +#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
- #ifndef FF_API_AUDIOENC_DELAY
- #define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
 +#ifndef FF_API_VAAPI_CONTEXT
 +#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
  #ifndef FF_API_AVCTX_TIMEBASE
 -#define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 58)
 +#define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 59)
  #endif
  #ifndef FF_API_MPV_OPT
  #define FF_API_MPV_OPT   (LIBAVCODEC_VERSION_MAJOR < 58)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec: drop deprecated vismv option

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:52:24 
2017 -0300| [eb5f84633991eeed2c4a547ae04b593ad6adb03e] | committer: James Almer

avcodec: drop deprecated vismv option

Deprecated in 08/2014.

Signed-off-by: James Almer 

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

 doc/codecs.texi|  15 
 libavcodec/mpegvideo.c | 218 -
 libavcodec/options_table.h |   6 --
 libavcodec/utils.c |   6 --
 libavcodec/version.h   |   4 -
 5 files changed, 249 deletions(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 6ab02c35de..6f0aad2169 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -506,21 +506,6 @@ threading operations
 skip motion compensation
 @end table
 
-@item vismv @var{integer} (@emph{decoding,video})
-Visualize motion vectors (MVs).
-
-This option is deprecated, see the codecview filter instead.
-
-Possible values:
-@table @samp
-@item pf
-forward predicted MVs of P-frames
-@item bf
-forward predicted MVs of B-frames
-@item bb
-backward predicted MVs of B-frames
-@end table
-
 @item cmp @var{integer} (@emph{encoding,video})
 Set full pel me compare function.
 
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 75e6742995..2f5793b9a4 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1418,134 +1418,6 @@ void ff_mpv_frame_end(MpegEncContext *s)
 ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
 }
 
-
-#if FF_API_VISMV
-static int clip_line(int *sx, int *sy, int *ex, int *ey, int maxx)
-{
-if(*sx > *ex)
-return clip_line(ex, ey, sx, sy, maxx);
-
-if (*sx < 0) {
-if (*ex < 0)
-return 1;
-*sy = *ey + (*sy - *ey) * (int64_t)*ex / (*ex - *sx);
-*sx = 0;
-}
-
-if (*ex > maxx) {
-if (*sx > maxx)
-return 1;
-*ey = *sy + (*ey - *sy) * (int64_t)(maxx - *sx) / (*ex - *sx);
-*ex = maxx;
-}
-return 0;
-}
-
-
-/**
- * Draw a line from (ex, ey) -> (sx, sy).
- * @param w width of the image
- * @param h height of the image
- * @param stride stride/linesize of the image
- * @param color color of the arrow
- */
-static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey,
-  int w, int h, int stride, int color)
-{
-int x, y, fr, f;
-
-if (clip_line(&sx, &sy, &ex, &ey, w - 1))
-return;
-if (clip_line(&sy, &sx, &ey, &ex, h - 1))
-return;
-
-sx = av_clip(sx, 0, w - 1);
-sy = av_clip(sy, 0, h - 1);
-ex = av_clip(ex, 0, w - 1);
-ey = av_clip(ey, 0, h - 1);
-
-buf[sy * stride + sx] += color;
-
-if (FFABS(ex - sx) > FFABS(ey - sy)) {
-if (sx > ex) {
-FFSWAP(int, sx, ex);
-FFSWAP(int, sy, ey);
-}
-buf += sx + sy * stride;
-ex  -= sx;
-f= ((ey - sy) << 16) / ex;
-for (x = 0; x <= ex; x++) {
-y  = (x * f) >> 16;
-fr = (x * f) & 0x;
-buf[y * stride + x]   += (color * (0x1 - fr)) >> 16;
-if(fr) buf[(y + 1) * stride + x] += (color *fr ) >> 16;
-}
-} else {
-if (sy > ey) {
-FFSWAP(int, sx, ex);
-FFSWAP(int, sy, ey);
-}
-buf += sx + sy * stride;
-ey  -= sy;
-if (ey)
-f = ((ex - sx) << 16) / ey;
-else
-f = 0;
-for(y= 0; y <= ey; y++){
-x  = (y*f) >> 16;
-fr = (y*f) & 0x;
-buf[y * stride + x] += (color * (0x1 - fr)) >> 16;
-if(fr) buf[y * stride + x + 1] += (color *fr ) >> 16;
-}
-}
-}
-
-/**
- * Draw an arrow from (ex, ey) -> (sx, sy).
- * @param w width of the image
- * @param h height of the image
- * @param stride stride/linesize of the image
- * @param color color of the arrow
- */
-static void draw_arrow(uint8_t *buf, int sx, int sy, int ex,
-   int ey, int w, int h, int stride, int color, int tail, 
int direction)
-{
-int dx,dy;
-
-if (direction) {
-FFSWAP(int, sx, ex);
-FFSWAP(int, sy, ey);
-}
-
-sx = av_clip(sx, -100, w + 100);
-sy = av_clip(sy, -100, h + 100);
-ex = av_clip(ex, -100, w + 100);
-ey = av_clip(ey, -100, h + 100);
-
-dx = ex - sx;
-dy = ey - sy;
-
-if (dx * dx + dy * dy > 3 * 3) {
-int rx =  dx + dy;
-int ry = -dx + dy;
-int length = ff_sqrt((rx * rx + ry * ry) << 8);
-
-// FIXME subpixel accuracy
-rx = ROUNDED_DIV(rx * 3 << 4, length);
-ry = ROUNDED_DIV(ry * 3 << 4, length);
-
-if (tail) {
-rx = -rx;
-ry = -ry;
-}
-
-draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color);
-draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color);
-}
-draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
-}
-

[FFmpeg-cvslog] lavc: Drop deprecated time_base variable for decoding

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Thu 
Mar 16 15:56:59 2017 -0400| [c43a96fe16e6a6ea091e64ca271f0788f4a0bea9] | 
committer: Vittorio Giovara

lavc: Drop deprecated time_base variable for decoding

Deprecated in 10/2015.

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

 libavcodec/decode.c   | 5 -
 libavcodec/mpegvideo_parser.c | 5 -
 libavcodec/utils.c| 5 -
 libavcodec/version.h  | 3 ---
 4 files changed, 18 deletions(-)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index f4088cdae8..e4f6a0d727 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -354,11 +354,6 @@ static int decode_simple_internal(AVCodecContext *avctx, 
AVFrame *frame)
 if (ret >= 0 && avctx->codec->type == AVMEDIA_TYPE_VIDEO)
 ret = pkt->size;
 
-#if FF_API_AVCTX_TIMEBASE
-if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
-avctx->time_base = av_inv_q(avctx->framerate);
-#endif
-
 if (avctx->internal->draining && !got_frame)
 avci->draining_done = 1;
 
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index 500d1240ef..f883b5f819 100644
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -163,11 +163,6 @@ static void mpegvideo_extract_headers(AVCodecParserContext 
*s,
 s->coded_width  = FFALIGN(pc->width,  16);
 s->coded_height = FFALIGN(pc->height, 16);
 }
-
-#if FF_API_AVCTX_TIMEBASE
-if (avctx->framerate.num)
-avctx->time_base = av_inv_q(avctx->framerate);
-#endif
 }
 
 static int mpegvideo_parse(AVCodecParserContext *s,
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a6408cecbb..bc421f67f8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -663,11 +663,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 ret = AVERROR(EINVAL);
 goto free_and_end;
 }
-
-#if FF_API_AVCTX_TIMEBASE
-if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
-avctx->time_base = av_inv_q(avctx->framerate);
-#endif
 }
 end:
 if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) && codec->init) 
{
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b60e9715aa..f53bdb5ccc 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_AVCTX_TIMEBASE
-#define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_MPV_OPT
 #define FF_API_MPV_OPT   (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 16:56:18 
2017 -0300| [3e0a16f0033390a32f8d96c0bd1040030c89e1c0] | committer: James Almer

Merge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9'

* commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9':
  lavc: Drop deprecated time_base variable for decoding

This commit is a noop. The API has been postponed.

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avodec/vaapi: drop deprecated vaapi_context fields

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 17:00:06 
2017 -0300| [fb41bad7e051240017bc4cc79c50ea36ac12b96c] | committer: James Almer

avodec/vaapi: drop deprecated vaapi_context fields

Deprecated in 07/2015.

Signed-off-by: James Almer 

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

 libavcodec/vaapi.h   | 109 ---
 libavcodec/version.h |   3 --
 2 files changed, 112 deletions(-)

diff --git a/libavcodec/vaapi.h b/libavcodec/vaapi.h
index bb28455329..2cf7da5889 100644
--- a/libavcodec/vaapi.h
+++ b/libavcodec/vaapi.h
@@ -77,115 +77,6 @@ struct attribute_deprecated vaapi_context {
  * - decoding: Set by user
  */
 uint32_t context_id;
-
-#if FF_API_VAAPI_CONTEXT
-/**
- * VAPictureParameterBuffer ID
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-uint32_t pic_param_buf_id;
-
-/**
- * VAIQMatrixBuffer ID
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-uint32_t iq_matrix_buf_id;
-
-/**
- * VABitPlaneBuffer ID (for VC-1 decoding)
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-uint32_t bitplane_buf_id;
-
-/**
- * Slice parameter/data buffer IDs
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-uint32_t *slice_buf_ids;
-
-/**
- * Number of effective slice buffer IDs to send to the HW
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-unsigned int n_slice_buf_ids;
-
-/**
- * Size of pre-allocated slice_buf_ids
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-unsigned int slice_buf_ids_alloc;
-
-/**
- * Pointer to VASliceParameterBuffers
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-void *slice_params;
-
-/**
- * Size of a VASliceParameterBuffer element
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-unsigned int slice_param_size;
-
-/**
- * Size of pre-allocated slice_params
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-unsigned int slice_params_alloc;
-
-/**
- * Number of slices currently filled in
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-unsigned int slice_count;
-
-/**
- * Pointer to slice data buffer base
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-const uint8_t *slice_data;
-
-/**
- * Current size of slice data
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
-attribute_deprecated
-uint32_t slice_data_size;
-#endif
 };
 
 /* @} */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 6c52ae983c..8fbbe6cd96 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_VAAPI_CONTEXT
-#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_AVCTX_TIMEBASE
 #define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 59)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: Drop deprecated options moved to private contexts

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Thu 
Mar 16 16:03:38 2017 -0400| [94eed68ace9f2416af8457fcbf142b175928c06b] | 
committer: Vittorio Giovara

lavc: Drop deprecated options moved to private contexts

Deprecated in 10/2014 and 07/2015.

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

 libavcodec/avcodec.h   | 114 -
 libavcodec/dnxhdenc.c  |   6 ---
 libavcodec/internal.h  |   2 -
 libavcodec/libvpxenc.c |   9 
 libavcodec/libx264.c   |  21 +
 libavcodec/libxavs.c   |  26 ---
 libavcodec/libxvid.c   |  24 --
 libavcodec/motion_est.c|  19 
 libavcodec/mpegvideo.h |   3 --
 libavcodec/mpegvideo_enc.c |  48 ---
 libavcodec/options.c   |  15 --
 libavcodec/options_table.h |  46 --
 libavcodec/svq1enc.c   |  13 --
 libavcodec/version.h   |  12 -
 14 files changed, 1 insertion(+), 357 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 2366acf93c..4bcead7106 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -658,25 +658,6 @@ typedef struct AVCodecDescriptor {
 #define AV_INPUT_BUFFER_MIN_SIZE 16384
 
 /**
- * @ingroup lavc_encoding
- * motion estimation type.
- * @deprecated use codec private option instead
- */
-#if FF_API_MOTION_EST
-enum Motion_Est_ID {
-ME_ZERO = 1,///< no search, that is use 0,0 vector whenever one is 
needed
-ME_FULL,
-ME_LOG,
-ME_PHODS,
-ME_EPZS,///< enhanced predictive zonal search
-ME_X1,  ///< reserved for experiments
-ME_HEX, ///< hexagon based search
-ME_UMH, ///< uneven multi-hexagon search
-ME_TESA,///< transformed exhaustive search algorithm
-};
-#endif
-
-/**
  * @ingroup lavc_decoding
  */
 enum AVDiscard{
@@ -1412,14 +1393,6 @@ typedef struct AVCodecContext {
  */
 enum AVPixelFormat pix_fmt;
 
-#if FF_API_MOTION_EST
-/**
- * This option does nothing
- * @deprecated use codec private options instead
- */
-attribute_deprecated int me_method;
-#endif
-
 /**
  * If non NULL, 'draw_horiz_band' is called by the libavcodec
  * decoder to draw a horizontal band. It improves cache usage. Not
@@ -1479,12 +1452,6 @@ typedef struct AVCodecContext {
  */
 float b_quant_factor;
 
-#if FF_API_RC_STRATEGY
-/** @deprecated use codec private option instead */
-attribute_deprecated int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-#endif
-
 #if FF_API_PRIVATE_OPT
 /** @deprecated use encoder private options instead */
 attribute_deprecated
@@ -1684,19 +1651,6 @@ typedef struct AVCodecContext {
  */
 int me_range;
 
-#if FF_API_QUANT_BIAS
-/**
- * @deprecated use encoder private option instead
- */
-attribute_deprecated int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 99
-
-/**
- * @deprecated use encoder private option instead
- */
-attribute_deprecated int inter_quant_bias;
-#endif
-
 /**
  * slice flags
  * - encoding: unused
@@ -1741,20 +1695,6 @@ typedef struct AVCodecContext {
 int noise_reduction;
 #endif
 
-#if FF_API_MPV_OPT
-/**
- * @deprecated this field is unused
- */
-attribute_deprecated
-int me_threshold;
-
-/**
- * @deprecated this field is unused
- */
-attribute_deprecated
-int mb_threshold;
-#endif
-
 /**
  * precision of the intra DC coefficient - 8
  * - encoding: Set by user.
@@ -1776,14 +1716,6 @@ typedef struct AVCodecContext {
  */
 int skip_bottom;
 
-#if FF_API_MPV_OPT
-/**
- * @deprecated use encoder private options instead
- */
-attribute_deprecated
-float border_masking;
-#endif
-
 /**
  * minimum MB Lagrange multiplier
  * - encoding: Set by user.
@@ -2096,19 +2028,6 @@ typedef struct AVCodecContext {
  */
 int max_qdiff;
 
-#if FF_API_MPV_OPT
-/**
- * @deprecated use encoder private options instead
- */
-attribute_deprecated
-float rc_qsquish;
-
-attribute_deprecated
-float rc_qmod_amp;
-attribute_deprecated
-int rc_qmod_freq;
-#endif
-
 /**
  * decoder bitstream buffer size
  * - encoding: Set by user.
@@ -2124,14 +2043,6 @@ typedef struct AVCodecContext {
 int rc_override_count;
 RcOverride *rc_override;
 
-#if FF_API_MPV_OPT
-/**
- * @deprecated use encoder private options instead
- */
-attribute_deprecated
-const char *rc_eq;
-#endif
-
 /**
  * maximum bitrate
  * - encoding: Set by user.
@@ -2146,17 +2057,6 @@ typedef struct AVCodecContext {
  */
 int rc_min_rate;
 
-#if FF_API_MPV_OPT
-/**
- * @deprecated use encoder private options instead
- */
-attribute_deprecated
-float rc_buffer_aggressivity;
-
-attribute_deprecated
-float rc_initial_cplx;
-#endif
-
 /**
 

[FFmpeg-cvslog] lavc: Drop deprecated stream codec tag

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Thu 
Mar 16 16:21:54 2017 -0400| [0648dec19db83bc8c87814d195e32cbad5698a40] | 
committer: Vittorio Giovara

lavc: Drop deprecated stream codec tag

Deprecated in 07/2015.

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

 libavcodec/avcodec.h   | 8 
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 5 +
 libavutil/version.h| 4 ++--
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 4bcead7106..1c58fe2d68 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1217,14 +1217,6 @@ typedef struct AVCodecContext {
  */
 unsigned int codec_tag;
 
-#if FF_API_STREAM_CODEC_TAG
-/**
- * @deprecated this field is unused
- */
-attribute_deprecated
-unsigned int stream_codec_tag;
-#endif
-
 void *priv_data;
 
 /**
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 8868cea5e3..925ef376f3 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -233,9 +233,6 @@ static const AVOption avcodec_options[] = {
 {"simple", "use mbcmp (default)", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"},
 {"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS 
}, INT_MIN, INT_MAX, V|E, "mbd"},
 {"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"},
-#if FF_API_STREAM_CODEC_TAG
-{"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = 
DEFAULT }, INT_MIN, INT_MAX},
-#endif
 #if FF_API_PRIVATE_OPT
 {"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #endif
diff --git a/libavcodec/version.h b/libavcodec/version.h
index e79701ecaa..4fb0a97a27 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,11 +47,8 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_STREAM_CODEC_TAG
-#define FF_API_STREAM_CODEC_TAG  (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_CODED_FRAME
-#define FF_API_CODED_FRAME   (LIBAVCODEC_VERSION_MAJOR < 58)
+#define FF_API_CODED_FRAME   (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
 #ifndef FF_API_SIDEDATA_ONLY_PKT
 #define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
diff --git a/libavutil/version.h b/libavutil/version.h
index 904d387411..5ac2c831ed 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -91,10 +91,10 @@
 #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 (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
 #ifndef FF_API_ERROR_FRAME
-#define FF_API_ERROR_FRAME  (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_ERROR_FRAME  (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
 #ifndef FF_API_VAAPI
 #define FF_API_VAAPI(LIBAVUTIL_VERSION_MAJOR < 57)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '0648dec19db83bc8c87814d195e32cbad5698a40'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 17:23:43 
2017 -0300| [c17f638565c60c1763a8d5b2cdc034bda184e8e5] | committer: James Almer

Merge commit '0648dec19db83bc8c87814d195e32cbad5698a40'

* commit '0648dec19db83bc8c87814d195e32cbad5698a40':
  lavc: Drop deprecated stream codec tag

Merged-by: James Almer 

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

 libavcodec/avcodec.h   | 8 
 libavcodec/options_table.h | 3 ---
 libavcodec/version.h   | 3 ---
 3 files changed, 14 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 480fb70ce0..5f13f865e4 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1504,14 +1504,6 @@ typedef struct AVCodecContext {
  */
 unsigned int codec_tag;
 
-#if FF_API_STREAM_CODEC_TAG
-/**
- * @deprecated this field is unused
- */
-attribute_deprecated
-unsigned int stream_codec_tag;
-#endif
-
 void *priv_data;
 
 /**
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 770a6aafc3..d89f58d540 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -264,9 +264,6 @@ static const AVOption avcodec_options[] = {
 {"simple", "use mbcmp", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE }, 
INT_MIN, INT_MAX, V|E, "mbd"},
 {"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS 
}, INT_MIN, INT_MAX, V|E, "mbd"},
 {"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"},
-#if FF_API_STREAM_CODEC_TAG
-{"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = 
DEFAULT }, INT_MIN, INT_MAX},
-#endif
 #if FF_API_PRIVATE_OPT
 {"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #endif
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 15d7a16a96..69f124a4c6 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -60,9 +60,6 @@
 #ifndef FF_API_AVCTX_TIMEBASE
 #define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_STREAM_CODEC_TAG
-#define FF_API_STREAM_CODEC_TAG  (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_CODED_FRAME
 #define FF_API_CODED_FRAME   (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif


==

diff --cc libavcodec/options_table.h
index 770a6aafc3,925ef376f3..d89f58d540
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@@ -260,13 -229,10 +260,10 @@@ static const AVOption avcodec_options[
  {"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = 
DEFAULT }, INT_MIN, INT_MAX, V|E},
  #endif
  {"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT 
}, INT_MIN, INT_MAX},
 -{"mbd", "macroblock decision algorithm (high quality mode)", 
OFFSET(mb_decision), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, 
"mbd"},
 -{"simple", "use mbcmp (default)", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"},
 +{"mbd", "macroblock decision algorithm (high quality mode)", 
OFFSET(mb_decision), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 2, V|E, "mbd"},
 +{"simple", "use mbcmp", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE 
}, INT_MIN, INT_MAX, V|E, "mbd"},
  {"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS 
}, INT_MIN, INT_MAX, V|E, "mbd"},
  {"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.i64 = 
FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"},
- #if FF_API_STREAM_CODEC_TAG
- {"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = 
DEFAULT }, INT_MIN, INT_MAX},
- #endif
  #if FF_API_PRIVATE_OPT
  {"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
  #endif
diff --cc libavcodec/version.h
index 15d7a16a96,4fb0a97a27..69f124a4c6
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,24 -45,8 +45,21 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the 
change.
   */
  
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
 +#ifndef FF_API_DEBUG_MV
 +#define FF_API_DEBUG_MV  (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
 +#ifndef FF_API_AVCTX_TIMEBASE
 +#define FF_API_AVCTX_TIMEBASE(LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
- #ifndef FF_API_STREAM_CODEC_TAG
- #define FF_API_STREAM_CODEC_TAG  (LIBAVCODEC_VERS

[FFmpeg-cvslog] swscale: more accurate DITHER_COPY macro for full and limited range

[Mateusz]

ffmpeg | branch: master | Mateusz  | Fri Oct  6 
16:49:54 2017 +0200| [f192f2f061d979e3d2716b9892ca276b5d5cd418] | committer: 
Michael Niedermayer

swscale: more accurate DITHER_COPY macro for full and limited range

Signed-off-by: Michael Niedermayer 

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

 libswscale/swscale_unscaled.c  | 73 --
 tests/ref/vsynth/vsynth1-ffvhuff420p12 |  4 +-
 tests/ref/vsynth/vsynth1-vc2-420p10|  4 +-
 tests/ref/vsynth/vsynth1-vc2-420p12|  4 +-
 tests/ref/vsynth/vsynth2-ffvhuff420p12 |  4 +-
 tests/ref/vsynth/vsynth2-vc2-420p10|  4 +-
 tests/ref/vsynth/vsynth2-vc2-420p12|  4 +-
 tests/ref/vsynth/vsynth3-ffvhuff420p12 |  4 +-
 tests/ref/vsynth/vsynth_lena-ffvhuff420p12 |  4 +-
 tests/ref/vsynth/vsynth_lena-vc2-420p10|  4 +-
 tests/ref/vsynth/vsynth_lena-vc2-420p12|  4 +-
 11 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index ef36aec500..5d81cd5af9 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -110,24 +110,6 @@ DECLARE_ALIGNED(8, static const uint8_t, 
dithers)[8][8][8]={
   { 112, 16,104,  8,118, 22,110, 14,},
 }};
 
-static const uint16_t dither_scale[15][16]={
-{2,3,3,5,5,5,5,5,5,5,5,5,
5,5,5,5,},
-{2,3,7,7,   13,   13,   25,   25,   25,   25,   25,   25,   
25,   25,   25,   25,},
-{3,3,4,   15,   15,   29,   57,   57,   57,  113,  113,  113,  
113,  113,  113,  113,},
-{3,4,4,5,   31,   31,   61,  121,  241,  241,  241,  241,  
481,  481,  481,  481,},
-{3,4,5,5,6,   63,   63,  125,  249,  497,  993,  993,  
993,  993,  993, 1985,},
-{3,5,6,6,6,7,  127,  127,  253,  505, 1009, 2017, 
4033, 4033, 4033, 4033,},
-{3,5,6,7,7,7,8,  255,  255,  509, 1017, 2033, 
4065, 8129,16257,16257,},
-{3,5,6,8,8,8,8,9,  511,  511, 1021, 2041, 
4081, 8161,16321,32641,},
-{3,5,7,8,9,9,9,9,   10, 1023, 1023, 2045, 
4089, 8177,16353,32705,},
-{3,5,7,8,   10,   10,   10,   10,   10,   11, 2047, 2047, 
4093, 8185,16369,32737,},
-{3,5,7,8,   10,   11,   11,   11,   11,   11,   12, 4095, 
4095, 8189,16377,32753,},
-{3,5,7,9,   10,   12,   12,   12,   12,   12,   12,   13, 
8191, 8191,16381,32761,},
-{3,5,7,9,   10,   12,   13,   13,   13,   13,   13,   13,   
14,16383,16383,32765,},
-{3,5,7,9,   10,   12,   14,   14,   14,   14,   14,   14,   
14,   15,32767,32767,},
-{3,5,7,9,   11,   12,   14,   15,   15,   15,   15,   15,   
15,   15,   16,65535,},
-};
-
 
 static void fillPlane(uint8_t *plane, int stride, int width, int height, int y,
   uint8_t val)
@@ -1502,24 +1484,45 @@ static int packedCopyWrapper(SwsContext *c, const 
uint8_t *src[],
 }
 
 #define DITHER_COPY(dst, dstStride, src, srcStride, bswap, dbswap)\
-uint16_t scale= dither_scale[dst_depth-1][src_depth-1];\
-int shift= src_depth-dst_depth + dither_scale[src_depth-2][dst_depth-1];\
-for (i = 0; i < height; i++) {\
-const uint8_t *dither= dithers[src_depth-9][i&7];\
-for (j = 0; j < length-7; j+=8){\
-dst[j+0] = dbswap((bswap(src[j+0]) + dither[0])*scale>>shift);\
-dst[j+1] = dbswap((bswap(src[j+1]) + dither[1])*scale>>shift);\
-dst[j+2] = dbswap((bswap(src[j+2]) + dither[2])*scale>>shift);\
-dst[j+3] = dbswap((bswap(src[j+3]) + dither[3])*scale>>shift);\
-dst[j+4] = dbswap((bswap(src[j+4]) + dither[4])*scale>>shift);\
-dst[j+5] = dbswap((bswap(src[j+5]) + dither[5])*scale>>shift);\
-dst[j+6] = dbswap((bswap(src[j+6]) + dither[6])*scale>>shift);\
-dst[j+7] = dbswap((bswap(src[j+7]) + dither[7])*scale>>shift);\
+unsigned shift= src_depth-dst_depth, tmp;\
+if (shiftonly) {\
+for (i = 0; i < height; i++) {\
+const uint8_t *dither= dithers[shift-1][i&7];\
+for (j = 0; j < length-7; j+=8) {\
+tmp = (bswap(src[j+0]) + dither[0])>>shift; dst[j+0] = 
dbswap(tmp - (tmp>>dst_depth));\
+tmp = (bswap(src[j+1]) + dither[1])>>shift; dst[j+1] = 
dbswap(tmp - (tmp>>dst_depth));\
+tmp = (bswap(src[j+2]) + dither[2])>>shift; dst[j+2] = 
dbswap(tmp - (tmp>>dst_depth));\
+tmp = (bswap(src[j+3]) + dither[3])>>shift; dst[j+3] = 
dbswap(tmp - (tmp>>dst_depth));\
+tmp = (bswap(src[j+4]) + dither[4])>>shift; dst[j+4] = 
dbswap(tmp - (tmp>>dst_depth));\
+tmp = (bswap(src[j+5]) + dither[5])>>shift; dst[j+5] = 
dbswap(tmp - (tmp>>dst_depth));\
+tmp = (bswap(src[j+6]) + dither[6])>

[FFmpeg-cvslog] lavu: Drop deprecated VDPAU pixel formats

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 17:13:33 2016 -0500| [dd343fd986459f467a2d1d70c26101dff1d47d68] | 
committer: Vittorio Giovara

lavu: Drop deprecated VDPAU pixel formats

Deprecated in 07/2013.

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

 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 e4e5674a66..815e084155 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -822,44 +822,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 0b7582576b..3c670fc9d4 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -92,13 +92,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
 
@@ -127,9 +120,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 5ac2c831ed..3b2280cecd 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_OPT_TYPE_METADATA
 #define FF_API_OPT_TYPE_METADATA(LIB

[FFmpeg-cvslog] Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 18:15:49 
2017 -0300| [b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed] | committer: James Almer

Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'

* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
  lavu: Drop deprecated VDPAU pixel formats

Merged-by: James Almer 

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

 configure  |  11 --
 libavcodec/allcodecs.c |  16 ---
 libavcodec/h263dec.c   |   1 -
 libavcodec/h264_picture.c  |   1 -
 libavcodec/h264dec.c   |  28 +---
 libavcodec/mpeg12dec.c |  64 +
 libavcodec/mpeg4videodec.c |  26 
 libavcodec/vc1dec.c|  33 -
 libavcodec/vdpau.c | 345 -
 libavcodec/vdpau_compat.h  |  48 ---
 libavutil/pixdesc.c|  38 -
 libavutil/pixfmt.h |  10 --
 libavutil/version.h|   3 -
 13 files changed, 2 insertions(+), 622 deletions(-)

diff --git a/configure b/configure
index 2443986d21..98c92b2bdb 100755
--- a/configure
+++ b/configure
@@ -2810,8 +2810,6 @@ h264_rkmpp_decoder_deps="rkmpp"
 h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"
 h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
 h264_vaapi_encoder_select="cbs_h264 vaapi_encode"
-h264_vdpau_decoder_deps="vdpau"
-h264_vdpau_decoder_select="h264_decoder"
 h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m"
 h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m"
 hevc_cuvid_decoder_deps="cuda cuvid"
@@ -2833,8 +2831,6 @@ mjpeg_cuvid_decoder_deps="cuda cuvid"
 mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
 mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 mpeg1_cuvid_decoder_deps="cuda cuvid"
-mpeg1_vdpau_decoder_deps="vdpau"
-mpeg1_vdpau_decoder_select="mpeg1video_decoder"
 mpeg1_v4l2m2m_decoder_deps="v4l2_m2m mpeg1_v4l2_m2m"
 mpeg2_crystalhd_decoder_select="crystalhd"
 mpeg2_cuvid_decoder_deps="cuda cuvid"
@@ -2852,20 +2848,14 @@ mpeg4_cuvid_decoder_deps="cuda cuvid"
 mpeg4_mediacodec_decoder_deps="mediacodec"
 mpeg4_mmal_decoder_deps="mmal"
 mpeg4_omx_encoder_deps="omx"
-mpeg4_vdpau_decoder_deps="vdpau"
-mpeg4_vdpau_decoder_select="mpeg4_decoder"
 mpeg4_v4l2m2m_decoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
 mpeg4_v4l2m2m_encoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
-mpeg_vdpau_decoder_deps="vdpau"
-mpeg_vdpau_decoder_select="mpeg2video_decoder"
 msmpeg4_crystalhd_decoder_select="crystalhd"
 nvenc_h264_encoder_select="h264_nvenc_encoder"
 nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 vc1_crystalhd_decoder_select="crystalhd"
 vc1_cuvid_decoder_deps="cuda cuvid"
 vc1_mmal_decoder_deps="mmal"
-vc1_vdpau_decoder_deps="vdpau"
-vc1_vdpau_decoder_select="vc1_decoder"
 vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m"
 vp8_cuvid_decoder_deps="cuda cuvid"
 vp8_mediacodec_decoder_deps="mediacodec"
@@ -2883,7 +2873,6 @@ vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9"
 vp9_vaapi_encoder_select="vaapi_encode"
 vp9_v4l2m2m_decoder_deps="v4l2_m2m vp9_v4l2_m2m"
 wmv3_crystalhd_decoder_select="crystalhd"
-wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
 
 # parsers
 h264_parser_select="golomb h264dsp h264parse"
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index dea1b1d13b..83691267aa 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -215,9 +215,6 @@ static void register_all(void)
 REGISTER_DECODER(H264_MMAL, h264_mmal);
 REGISTER_DECODER(H264_QSV,  h264_qsv);
 REGISTER_DECODER(H264_RKMPP,h264_rkmpp);
-#if FF_API_VDPAU
-REGISTER_DECODER(H264_VDPAU,h264_vdpau);
-#endif
 REGISTER_ENCDEC (HAP,   hap);
 REGISTER_DECODER(HEVC,  hevc);
 REGISTER_DECODER(HEVC_QSV,  hevc_qsv);
@@ -256,14 +253,7 @@ static void register_all(void)
 REGISTER_DECODER(MPEG4_CRYSTALHD,   mpeg4_crystalhd);
 REGISTER_DECODER(MPEG4_V4L2M2M, mpeg4_v4l2m2m);
 REGISTER_DECODER(MPEG4_MMAL,mpeg4_mmal);
-#if FF_API_VDPAU
-REGISTER_DECODER(MPEG4_VDPAU,   mpeg4_vdpau);
-#endif
 REGISTER_DECODER(MPEGVIDEO, mpegvideo);
-#if FF_API_VDPAU
-REGISTER_DECODER(MPEG_VDPAU,mpeg_vdpau);
-REGISTER_DECODER(MPEG1_VDPAU,   mpeg1_vdpau);
-#endif
 REGISTER_DECODER(MPEG1_V4L2M2M, mpeg1_v4l2m2m);
 REGISTER_DECODER(MPEG2_MMAL,mpeg2_mmal);
 REGISTER_DECODER(MPEG2_CRYSTALHD,   mpeg2_crystalhd);
@@ -359,9 +349,6 @@ static void register_all(void)
 REGISTER_DECODER(VBLE,  vble);
 REGISTER_DECODER(VC1,   vc1);
 REGISTER_DECODER(VC1_CRYSTALHD, vc1_crystalhd);
-#if FF_API_VDPAU
-REGISTER_DECODER(VC1_VDPAU, vc1_vdpau);
-#endif
 REGISTER_DECODER(VC1IMAGE,  vc1image);
 REGISTER_DECODER(VC1_MMAL,  vc1_mmal);
 REGISTER_DECODER(VC1_QSV,   vc1_qsv);
@@ -390,9 +377,6 @@ static void register_all(void)
 REGISTER_ENCDEC (WMV2,  wmv2);
 REGIS

[FFmpeg-cvslog] lavu: Drop deprecated option type

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Mon 
Dec  5 17:22:49 2016 -0500| [619a433eca2c5655c41b799e0b06380020fb1498] | 
committer: Vittorio Giovara

lavu: Drop deprecated option type

Deprecated in 02/2014.

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

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

diff --git a/libavutil/opt.h b/libavutil/opt.h
index a65c4f41ba..b68a396da7 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 3b2280cecd..d11e8d10f2 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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 18:18:00 
2017 -0300| [c0cfc0ce11c14285299838d2c1e96159bf9cb9de] | committer: James Almer

Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'

* commit '619a433eca2c5655c41b799e0b06380020fb1498':
  lavu: Drop deprecated option type

Merged-by: James Almer 

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

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

diff --git a/libavutil/opt.h b/libavutil/opt.h
index 0d893795de..555929dd6b 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -275,9 +275,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 def7153f31..2aa89914be 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -106,9 +106,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


==


___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavu: Drop deprecated av_dlog macro

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Thu 
Mar 16 15:30:58 2017 -0400| [35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc] | 
committer: Vittorio Giovara

lavu: Drop deprecated av_dlog macro

Deprecated in 05/2015.

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

 libavutil/log.h | 14 --
 libavutil/version.h |  3 ---
 2 files changed, 17 deletions(-)

diff --git a/libavutil/log.h b/libavutil/log.h
index d4daea9c1a..ce00bccc7b 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -249,20 +249,6 @@ void av_log_default_callback(void *avcl, int level, const 
char *fmt,
  */
 const char* av_default_item_name(void* ctx);
 
-#if FF_API_DLOG
-/**
- * av_dlog macros
- * @deprecated unused
- * Useful to print debug messages that shouldn't get compiled in normally.
- */
-
-#ifdef DEBUG
-#define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#define av_dlog(pctx, ...)
-#endif
-#endif /* FF_API_DLOG */
-
 /**
  * Skip repeated messages, this requires the user app to use av_log() instead 
of
  * (f)printf as the 2 would otherwise interfere and lead to
diff --git a/libavutil/version.h b/libavutil/version.h
index d11e8d10f2..b8425ea2c8 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -78,9 +78,6 @@
  * @{
  */
 
-#ifndef FF_API_DLOG
-#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_CRYPTO_CONTEXT
 #define FF_API_CRYPTO_CONTEXT   (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 18:20:07 
2017 -0300| [572b7a0b8562fd42e51fda1006cdfd3c387fd649] | committer: James Almer

Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'

* commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc':
  lavu: Drop deprecated av_dlog macro

Merged-by: James Almer 

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

 libavutil/log.h | 14 --
 libavutil/version.h |  3 ---
 2 files changed, 17 deletions(-)

diff --git a/libavutil/log.h b/libavutil/log.h
index f0a57385df..d9554e609d 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -334,20 +334,6 @@ void av_log_format_line(void *ptr, int level, const char 
*fmt, va_list vl,
 int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
 char *line, int line_size, int *print_prefix);
 
-#if FF_API_DLOG
-/**
- * av_dlog macros
- * @deprecated unused
- * Useful to print debug messages that shouldn't get compiled in normally.
- */
-
-#ifdef DEBUG
-#define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, 
__VA_ARGS__); } while (0)
-#endif
-#endif /* FF_API_DLOG */
-
 /**
  * Skip repeated messages, this requires the user app to use av_log() instead 
of
  * (f)printf as the 2 would otherwise interfere and lead to
diff --git a/libavutil/version.h b/libavutil/version.h
index 2aa89914be..ad22e67b03 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -106,9 +106,6 @@
  * @{
  */
 
-#ifndef FF_API_DLOG
-#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_VAAPI
 #define FF_API_VAAPI(LIBAVUTIL_VERSION_MAJOR < 57)
 #endif


==

diff --cc libavutil/log.h
index f0a57385df,ce00bccc7b..d9554e609d
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@@ -305,49 -248,7 +305,35 @@@ void av_log_default_callback(void *avcl
   * @return The AVClass class_name
   */
  const char* av_default_item_name(void* ctx);
 +AVClassCategory av_default_get_category(void *ptr);
 +
 +/**
 + * Format a line of log the same way as the default callback.
 + * @param line  buffer to receive the formatted line
 + * @param line_size size of the buffer
 + * @param print_prefix  used to store whether the prefix must be printed;
 + *  must point to a persistent integer initially set to 1
 + */
 +void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
 +char *line, int line_size, int *print_prefix);
 +
 +/**
 + * Format a line of log the same way as the default callback.
 + * @param line  buffer to receive the formatted line;
 + *  may be NULL if line_size is 0
 + * @param line_size size of the buffer; at most line_size-1 characters 
will
 + *  be written to the buffer, plus one null terminator
 + * @param print_prefix  used to store whether the prefix must be printed;
 + *  must point to a persistent integer initially set to 1
 + * @return Returns a negative value if an error occurred, otherwise returns
 + * the number of characters that would have been written for a
 + * sufficiently large buffer, not including the terminating null
 + * character. If the return value is not less than line_size, it means
 + * that the log message was truncated to fit the buffer.
 + */
 +int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
 +char *line, int line_size, int *print_prefix);
  
- #if FF_API_DLOG
- /**
-  * av_dlog macros
-  * @deprecated unused
-  * Useful to print debug messages that shouldn't get compiled in normally.
-  */
- 
- #ifdef DEBUG
- #define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
- #else
- #define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, 
__VA_ARGS__); } while (0)
- #endif
- #endif /* FF_API_DLOG */
- 
  /**
   * Skip repeated messages, this requires the user app to use av_log() instead 
of
   * (f)printf as the 2 would otherwise interfere and lead to
diff --cc libavutil/version.h
index 2aa89914be,b8425ea2c8..ad22e67b03
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@@ -106,14 -78,8 +106,11 @@@
   * @{
   */
  
- #ifndef FF_API_DLOG
- #define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
- #endif
 -#ifndef FF_API_CRYPTO_CONTEXT
 -#define FF_API_CRYPTO_CONTEXT   (LIBAVUTIL_VERSION_MAJOR < 57)
 +#ifndef FF_API_VAAPI
 +#define FF_API_VAAPI(LIBAVUTIL_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_FRAME_QP
 +#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57)
  #endif
  #ifndef FF_API_PLUS1_MINUS1
  #define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)

_

[FFmpeg-cvslog] Merge commit '5f90ad99bb7e53383fefab5107b861e4c4600700'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 18:46:28 
2017 -0300| [2f4677a11fd9de98851886841e55c89a655f2605] | committer: James Almer

Merge commit '5f90ad99bb7e53383fefab5107b861e4c4600700'

* commit '5f90ad99bb7e53383fefab5107b861e4c4600700':
  spherical: Change types of bounding and pad to uint32_t

This commit is a noop, see f20bcec4c2b1c2a57ed89e5be1ac2e0db1bc62b4

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] spherical: Change types of bounding and pad to uint32_t

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Tue 
Mar 14 17:50:48 2017 -0400| [5f90ad99bb7e53383fefab5107b861e4c4600700] | 
committer: Vittorio Giovara

spherical: Change types of bounding and pad to uint32_t

These values are defined to be 32bit in the specification,
so it makes more sense to store them as fixed width.

Based on a patch by Micahel Niedermayer .

Signed-off-by: Vittorio Giovara 

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

 libavformat/dump.c|  2 +-
 libavformat/matroskadec.c |  6 +++---
 libavformat/mov.c |  7 +++
 libavutil/spherical.h | 10 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/libavformat/dump.c b/libavformat/dump.c
index 7514aee7ac..c56895628d 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -339,7 +339,7 @@ static void dump_spherical(void *ctx, AVCodecParameters 
*par, AVPacketSideData *
  &l, &t, &r, &b);
 av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b);
 } else if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
-av_log(ctx, AV_LOG_INFO, "[pad %zu] ", spherical->padding);
+av_log(ctx, AV_LOG_INFO, "[pad %"PRIu32"] ", spherical->padding);
 }
 }
 
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 4fbf4b9a96..c6e1a190a8 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1601,8 +1601,8 @@ static int mkv_parse_video_projection(AVStream *st, const 
MatroskaTrack *track)
 AVSphericalMapping *spherical;
 enum AVSphericalProjection projection;
 size_t spherical_size;
-size_t l = 0, t = 0, r = 0, b = 0;
-size_t padding = 0;
+uint32_t l = 0, t = 0, r = 0, b = 0;
+uint32_t padding = 0;
 int ret;
 GetByteContext gb;
 
@@ -1627,7 +1627,7 @@ static int mkv_parse_video_projection(AVStream *st, const 
MatroskaTrack *track)
 if (b >= UINT_MAX - t || r >= UINT_MAX - l) {
 av_log(NULL, AV_LOG_ERROR,
"Invalid bounding rectangle coordinates "
-   "%zu,%zu,%zu,%zu\n", l, t, r, b);
+   "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", l, t, r, 
b);
 return AVERROR_INVALIDDATA;
 }
 } else if (track->video.projection.private.size != 0) {
diff --git a/libavformat/mov.c b/libavformat/mov.c
index c6e7a38398..1c1857eaf9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3237,9 +3237,8 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 MOVStreamContext *sc;
 int size, version, layout;
 int32_t yaw, pitch, roll;
-size_t l = 0, t = 0, r = 0, b = 0;
-size_t padding = 0;
-uint32_t tag;
+uint32_t l = 0, t = 0, r = 0, b = 0;
+uint32_t tag, padding = 0;
 enum AVSphericalProjection projection;
 
 if (c->fc->nb_streams < 1)
@@ -3335,7 +3334,7 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 if (b >= UINT_MAX - t || r >= UINT_MAX - l) {
 av_log(c->fc, AV_LOG_ERROR,
"Invalid bounding rectangle coordinates "
-   "%zu,%zu,%zu,%zu\n", l, t, r, b);
+   "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", l, t, r, b);
 return AVERROR_INVALIDDATA;
 }
 
diff --git a/libavutil/spherical.h b/libavutil/spherical.h
index e7fc1d69fb..fd662cf676 100644
--- a/libavutil/spherical.h
+++ b/libavutil/spherical.h
@@ -164,10 +164,10 @@ typedef struct AVSphericalMapping {
  *   projection type (@ref AV_SPHERICAL_EQUIRECTANGULAR_TILE),
  *   and should be ignored in all other cases.
  */
-size_t bound_left;   ///< Distance from the left edge
-size_t bound_top;///< Distance from the top edge
-size_t bound_right;  ///< Distance from the right edge
-size_t bound_bottom; ///< Distance from the bottom edge
+uint32_t bound_left;   ///< Distance from the left edge
+uint32_t bound_top;///< Distance from the top edge
+uint32_t bound_right;  ///< Distance from the right edge
+uint32_t bound_bottom; ///< Distance from the bottom edge
 /**
  * @}
  */
@@ -179,7 +179,7 @@ typedef struct AVSphericalMapping {
  *   (@ref AV_SPHERICAL_CUBEMAP), and should be ignored in all other
  *   cases.
  */
-size_t padding;
+uint32_t padding;
 } AVSphericalMapping;
 
 /**

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 18:49:22 
2017 -0300| [69bb3f7bffa20b843efb1b52514bb8e65362936c] | committer: James Almer

Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'

* commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe':
  vf_showinfo: Simplify reporting stereo3d information

Merged-by: James Almer 

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

 libavfilter/vf_showinfo.c | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 14b8aa4aff..834e742fcb 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -48,19 +48,7 @@ static void dump_stereo3d(AVFilterContext *ctx, 
AVFrameSideData *sd)
 
 stereo = (AVStereo3D *)sd->data;
 
-av_log(ctx, AV_LOG_INFO, "type - ");
-switch (stereo->type) {
-case AV_STEREO3D_2D:  av_log(ctx, AV_LOG_INFO, "2D");  
   break;
-case AV_STEREO3D_SIDEBYSIDE:  av_log(ctx, AV_LOG_INFO, "side by 
side");   break;
-case AV_STEREO3D_TOPBOTTOM:   av_log(ctx, AV_LOG_INFO, "top and 
bottom"); break;
-case AV_STEREO3D_FRAMESEQUENCE:   av_log(ctx, AV_LOG_INFO, "frame 
alternate");break;
-case AV_STEREO3D_CHECKERBOARD:av_log(ctx, AV_LOG_INFO, 
"checkerboard");   break;
-case AV_STEREO3D_LINES:   av_log(ctx, AV_LOG_INFO, 
"interleaved lines");  break;
-case AV_STEREO3D_COLUMNS: av_log(ctx, AV_LOG_INFO, 
"interleaved columns");break;
-case AV_STEREO3D_SIDEBYSIDE_QUINCUNX: av_log(ctx, AV_LOG_INFO, "side by 
side "
-   "(quincunx 
subsampling)"); break;
-default:  av_log(ctx, AV_LOG_WARNING, 
"unknown"); break;
-}
+av_log(ctx, AV_LOG_INFO, "type - %s", av_stereo3d_type_name(stereo->type));
 
 if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
 av_log(ctx, AV_LOG_INFO, " (inverted)");


==


___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] vf_showinfo: Display spherical properties

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Wed 
Mar 15 17:55:18 2017 -0400| [883ce264d9ffc5bdaf477e09ee155b03339c46a6] | 
committer: Vittorio Giovara

vf_showinfo: Display spherical properties

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

 libavfilter/vf_showinfo.c | 41 +
 1 file changed, 41 insertions(+)

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index b44f3d2bf2..d5605e6922 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -29,6 +29,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/spherical.h"
 #include "libavutil/stereo3d.h"
 
 #include "avfilter.h"
@@ -39,6 +40,43 @@ typedef struct ShowInfoContext {
 unsigned int frame;
 } ShowInfoContext;
 
+static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, 
AVFrameSideData *sd)
+{
+AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data;
+double yaw, pitch, roll;
+
+av_log(ctx, AV_LOG_INFO, "spherical information: ");
+if (sd->size < sizeof(*spherical)) {
+av_log(ctx, AV_LOG_INFO, "invalid data");
+return;
+}
+
+if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
+av_log(ctx, AV_LOG_INFO, "equirectangular ");
+else if (spherical->projection == AV_SPHERICAL_CUBEMAP)
+av_log(ctx, AV_LOG_INFO, "cubemap ");
+else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE)
+av_log(ctx, AV_LOG_INFO, "tiled equirectangular ");
+else {
+av_log(ctx, AV_LOG_WARNING, "unknown");
+return;
+}
+
+yaw = ((double)spherical->yaw) / (1 << 16);
+pitch = ((double)spherical->pitch) / (1 << 16);
+roll = ((double)spherical->roll) / (1 << 16);
+av_log(ctx, AV_LOG_INFO, "(%f/%f/%f) ", yaw, pitch, roll);
+
+if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) {
+size_t l, t, r, b;
+av_spherical_tile_bounds(spherical, frame->width, frame->height,
+ &l, &t, &r, &b);
+av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b);
+} else if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
+av_log(ctx, AV_LOG_INFO, "[pad %"PRIu32"] ", spherical->padding);
+}
+}
+
 static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd)
 {
 AVStereo3D *stereo;
@@ -105,6 +143,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*frame)
 case AV_FRAME_DATA_A53_CC:
 av_log(ctx, AV_LOG_INFO, "A/53 closed captions (%d bytes)", 
sd->size);
 break;
+case AV_FRAME_DATA_SPHERICAL:
+dump_spherical(ctx, frame, sd);
+break;
 case AV_FRAME_DATA_STEREO3D:
 dump_stereo3d(ctx, sd);
 break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] vf_showinfo: Simplify reporting stereo3d information

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Wed 
Mar 15 17:39:53 2017 -0400| [3f128fc4a3fa1ef8a87974eb5484a997a84868fe] | 
committer: Vittorio Giovara

vf_showinfo: Simplify reporting stereo3d information

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

 libavfilter/vf_showinfo.c | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 204ff7a857..b44f3d2bf2 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -51,19 +51,7 @@ static void dump_stereo3d(AVFilterContext *ctx, 
AVFrameSideData *sd)
 
 stereo = (AVStereo3D *)sd->data;
 
-av_log(ctx, AV_LOG_INFO, "type - ");
-switch (stereo->type) {
-case AV_STEREO3D_2D:  av_log(ctx, AV_LOG_INFO, "2D");  
   break;
-case AV_STEREO3D_SIDEBYSIDE:  av_log(ctx, AV_LOG_INFO, "side by 
side");   break;
-case AV_STEREO3D_TOPBOTTOM:   av_log(ctx, AV_LOG_INFO, "top and 
bottom"); break;
-case AV_STEREO3D_FRAMESEQUENCE:   av_log(ctx, AV_LOG_INFO, "frame 
alternate");break;
-case AV_STEREO3D_CHECKERBOARD:av_log(ctx, AV_LOG_INFO, 
"checkerboard");   break;
-case AV_STEREO3D_LINES:   av_log(ctx, AV_LOG_INFO, 
"interleaved lines");  break;
-case AV_STEREO3D_COLUMNS: av_log(ctx, AV_LOG_INFO, 
"interleaved columns");break;
-case AV_STEREO3D_SIDEBYSIDE_QUINCUNX: av_log(ctx, AV_LOG_INFO, "side by 
side "
-   "(quincunx 
subsampling)"); break;
-default:  av_log(ctx, AV_LOG_WARNING, 
"unknown"); break;
-}
+av_log(ctx, AV_LOG_INFO, "type - %s", av_stereo3d_type_name(stereo->type));
 
 if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
 av_log(ctx, AV_LOG_INFO, " (inverted)");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 18:51:34 
2017 -0300| [0acb18d298721a75f433b49030204f59b6544f27] | committer: James Almer

Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'

* commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6':
  vf_showinfo: Display spherical properties

Merged-by: James Almer 

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

 libavfilter/vf_showinfo.c | 41 +
 1 file changed, 41 insertions(+)

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 834e742fcb..e0b3223801 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -29,6 +29,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/spherical.h"
 #include "libavutil/stereo3d.h"
 #include "libavutil/timestamp.h"
 
@@ -36,6 +37,43 @@
 #include "internal.h"
 #include "video.h"
 
+static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, 
AVFrameSideData *sd)
+{
+AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data;
+double yaw, pitch, roll;
+
+av_log(ctx, AV_LOG_INFO, "spherical information: ");
+if (sd->size < sizeof(*spherical)) {
+av_log(ctx, AV_LOG_INFO, "invalid data");
+return;
+}
+
+if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
+av_log(ctx, AV_LOG_INFO, "equirectangular ");
+else if (spherical->projection == AV_SPHERICAL_CUBEMAP)
+av_log(ctx, AV_LOG_INFO, "cubemap ");
+else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE)
+av_log(ctx, AV_LOG_INFO, "tiled equirectangular ");
+else {
+av_log(ctx, AV_LOG_WARNING, "unknown");
+return;
+}
+
+yaw = ((double)spherical->yaw) / (1 << 16);
+pitch = ((double)spherical->pitch) / (1 << 16);
+roll = ((double)spherical->roll) / (1 << 16);
+av_log(ctx, AV_LOG_INFO, "(%f/%f/%f) ", yaw, pitch, roll);
+
+if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) {
+size_t l, t, r, b;
+av_spherical_tile_bounds(spherical, frame->width, frame->height,
+ &l, &t, &r, &b);
+av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b);
+} else if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
+av_log(ctx, AV_LOG_INFO, "[pad %"PRIu32"] ", spherical->padding);
+}
+}
+
 static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd)
 {
 AVStereo3D *stereo;
@@ -128,6 +166,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*frame)
 case AV_FRAME_DATA_A53_CC:
 av_log(ctx, AV_LOG_INFO, "A/53 closed captions (%d bytes)", 
sd->size);
 break;
+case AV_FRAME_DATA_SPHERICAL:
+dump_spherical(ctx, frame, sd);
+break;
 case AV_FRAME_DATA_STEREO3D:
 dump_stereo3d(ctx, sd);
 break;


==

diff --cc libavfilter/vf_showinfo.c
index 834e742fcb,d5605e6922..e0b3223801
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@@ -29,13 -29,54 +29,51 @@@
  #include "libavutil/imgutils.h"
  #include "libavutil/internal.h"
  #include "libavutil/pixdesc.h"
+ #include "libavutil/spherical.h"
  #include "libavutil/stereo3d.h"
 +#include "libavutil/timestamp.h"
  
  #include "avfilter.h"
  #include "internal.h"
  #include "video.h"
  
 -typedef struct ShowInfoContext {
 -unsigned int frame;
 -} ShowInfoContext;
 -
+ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, 
AVFrameSideData *sd)
+ {
+ AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data;
+ double yaw, pitch, roll;
+ 
+ av_log(ctx, AV_LOG_INFO, "spherical information: ");
+ if (sd->size < sizeof(*spherical)) {
+ av_log(ctx, AV_LOG_INFO, "invalid data");
+ return;
+ }
+ 
+ if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
+ av_log(ctx, AV_LOG_INFO, "equirectangular ");
+ else if (spherical->projection == AV_SPHERICAL_CUBEMAP)
+ av_log(ctx, AV_LOG_INFO, "cubemap ");
+ else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE)
+ av_log(ctx, AV_LOG_INFO, "tiled equirectangular ");
+ else {
+ av_log(ctx, AV_LOG_WARNING, "unknown");
+ return;
+ }
+ 
+ yaw = ((double)spherical->yaw) / (1 << 16);
+ pitch = ((double)spherical->pitch) / (1 << 16);
+ roll = ((double)spherical->roll) / (1 << 16);
+ av_log(ctx, AV_LOG_INFO, "(%f/%f/%f) ", yaw, pitch, roll);
+ 
+ if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) {
+ size_t l, t, r, b;
+ av_spherical_tile_bounds(spherical, frame->width, frame->height,
+  &l, &t, &r, &b);
+ av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b);
+ } else if (spherical->proj

[FFmpeg-cvslog] Merge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 19:14:20 
2017 -0300| [6a426693cce083b32ac7e6fc61e458d53624ac0a] | committer: James Almer

Merge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24'

* commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24':
  avplay: Use the named syntax for buffersrc arguments

This commit is a noop, see 251f398798967380ce3fa3d1035e98c33e688338

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avplay: Use the named syntax for buffersrc arguments

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato  | Thu Mar 23 
12:20:50 2017 +0100| [8c616b3b8996bd4f9b117496b66b16cc625d7d24] | committer: 
Luca Barbato

avplay: Use the named syntax for buffersrc arguments

Avoid confusion.

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

 avtools/avplay.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/avtools/avplay.c b/avtools/avplay.c
index 18879e16bc..26279e857d 100644
--- a/avtools/avplay.c
+++ b/avtools/avplay.c
@@ -1441,7 +1441,8 @@ static int configure_video_filters(AVFilterGraph *graph, 
PlayerState *is, const
 snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%"PRId64, sws_flags);
 graph->scale_sws_opts = av_strdup(sws_flags_str);
 
-snprintf(buffersrc_args, sizeof(buffersrc_args), "%d:%d:%d:%d:%d:%d:%d",
+snprintf(buffersrc_args, sizeof(buffersrc_args),
+ "width=%d:height=%d:pix_fmt=%d:time_base=%d/%d:sar=%d/%d",
  codec->width, codec->height, codec->pix_fmt,
  is->video_st->time_base.num, is->video_st->time_base.den,
  codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.den);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '083ea8768121ee800893e124b08483011b798919'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 19:17:31 
2017 -0300| [a60fb1f88f49366df9711c729b0a33a90aba6223] | committer: James Almer

Merge commit '083ea8768121ee800893e124b08483011b798919'

* commit '083ea8768121ee800893e124b08483011b798919':
  APIchanges: Update bump dates

Merged-by: James Almer 

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

 doc/APIchanges | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 6803eaaea2..1490d67f27 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,15 +2,15 @@ Never assume the API of libav* to be stable unless at least 1 
month has passed
 since the last major version increase or the API was added.
 
 The last version increases were:
-libavcodec:2015-08-28
-libavdevice:   2015-08-28
-libavfilter:   2015-08-28
-libavformat:   2015-08-28
-libavresample: 2015-08-28
-libpostproc:   2015-08-28
-libswresample: 2015-08-28
-libswscale:2015-08-28
-libavutil: 2015-08-28
+libavcodec:2017-10-21
+libavdevice:   2017-10-21
+libavfilter:   2017-10-21
+libavformat:   2017-10-21
+libavresample: 2017-10-21
+libpostproc:   2017-10-21
+libswresample: 2017-10-21
+libswscale:2017-10-21
+libavutil: 2017-10-21
 
 
 API changes, most recent first:


==

diff --cc doc/APIchanges
index 6803eaaea2,a0ca3b7ac0..1490d67f27
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@@ -1,16 -1,14 +1,16 @@@
  Never assume the API of libav* to be stable unless at least 1 month has passed
 -since the last major version increase.
 +since the last major version increase or the API was added.
  
  The last version increases were:
- libavcodec:2015-08-28
- libavdevice:   2015-08-28
- libavfilter:   2015-08-28
- libavformat:   2015-08-28
- libavresample: 2015-08-28
- libpostproc:   2015-08-28
- libswresample: 2015-08-28
- libswscale:2015-08-28
- libavutil: 2015-08-28
 -libavcodec:2017-03-23
 -libavdevice:   2017-03-23
 -libavfilter:   2017-03-23
 -libavformat:   2017-03-23
 -libavresample: 2017-03-23
 -libswscale:2017-03-23
 -libavutil: 2017-03-23
++libavcodec:2017-10-21
++libavdevice:   2017-10-21
++libavfilter:   2017-10-21
++libavformat:   2017-10-21
++libavresample: 2017-10-21
++libpostproc:   2017-10-21
++libswresample: 2017-10-21
++libswscale:2017-10-21
++libavutil: 2017-10-21
  
  
  API changes, most recent first:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] APIchanges: Update bump dates

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara  | Thu 
Mar 23 10:39:11 2017 +0100| [083ea8768121ee800893e124b08483011b798919] | 
committer: Vittorio Giovara

APIchanges: Update bump dates

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

 doc/APIchanges | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index c6a5d82b99..a0ca3b7ac0 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,13 +2,13 @@ Never assume the API of libav* to be stable unless at least 1 
month has passed
 since the last major version increase.
 
 The last version increases were:
-libavcodec:2015-08-28
-libavdevice:   2015-08-28
-libavfilter:   2015-08-28
-libavformat:   2015-08-28
-libavresample: 2015-08-28
-libswscale:2015-08-28
-libavutil: 2015-08-28
+libavcodec:2017-03-23
+libavdevice:   2017-03-23
+libavfilter:   2017-03-23
+libavformat:   2017-03-23
+libavresample: 2017-03-23
+libswscale:2017-03-23
+libavutil: 2017-03-23
 
 
 API changes, most recent first:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 19:42:23 
2017 -0300| [4e6c85b3bae08aa2212d93d0f7986512226fb9c7] | committer: James Almer

Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'

* commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd':
  configure: Skip check for inline assembly capabilities when explicitly 
disabled

Merged-by: James Almer 

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

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

diff --git a/configure b/configure
index 98c92b2bdb..ae46567751 100755
--- a/configure
+++ b/configure
@@ -5384,7 +5384,7 @@ EOF
 sym=$($nm $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ 
\t]*ff_extern/)) }')
 extern_prefix=${sym%%ff_extern*}
 
-check_inline_asm inline_asm '"" ::'
+! disabled inline_asm && check_inline_asm inline_asm '"" ::'
 
 _restrict=
 for restrict_keyword in restrict __restrict__ __restrict; do


==


___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: Skip check for inline assembly capabilities when explicitly disabled

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun  | Fri Mar 24 
20:24:08 2017 +0100| [d6390090c4dbd766b77353553d9cb4fb4fb41ebd] | committer: 
Diego Biurrun

configure: Skip check for inline assembly capabilities when explicitly disabled

Otherwise inline assembly may get enabled when disabled on the command line.

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

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

diff --git a/configure b/configure
index 366520cf96..d9609fc51a 100755
--- a/configure
+++ b/configure
@@ -4251,7 +4251,7 @@ EOF
 sym=$($nm $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ 
\t]*ff_extern/)) }')
 extern_prefix=${sym%%ff_extern*}
 
-check_inline_asm inline_asm '"" ::'
+! disabled inline_asm && check_inline_asm inline_asm '"" ::'
 
 _restrict=
 for restrict_keyword in restrict __restrict__ __restrict; do

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] rtmpproto: send swfverify value as swfurl if latter is unused

[Ricardo Constantino]

ffmpeg | branch: master | Ricardo Constantino  | Mon Mar 20 
20:28:09 2017 +| [d4f3c26b700ae847433ba3c67dc99c32bc1fd4a1] | committer: 
Martin Storsjö

rtmpproto: send swfverify value as swfurl if latter is unused

Replicates lavf/librtmp.c behavior in L145-152 and rtmpdump's
behavior with "--swfVfy " passing the url to swfUrl.

Fixes bug 943.

Signed-off-by: Martin Storsjö 

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

 libavformat/rtmpproto.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 7d40227632..115c335974 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -339,9 +339,12 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
 ff_amf_write_field_name(&p, "flashVer");
 ff_amf_write_string(&p, rt->flashver);
 
-if (rt->swfurl) {
+if (rt->swfurl || rt->swfverify) {
 ff_amf_write_field_name(&p, "swfUrl");
-ff_amf_write_string(&p, rt->swfurl);
+if (rt->swfurl)
+ff_amf_write_string(&p, rt->swfurl);
+else
+ff_amf_write_string(&p, rt->swfverify);
 }
 
 ff_amf_write_field_name(&p, "tcUrl");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 19:54:45 
2017 -0300| [cd541de9dc27ae9e8a757c6cadfabb1f8c804d6c] | committer: James Almer

Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'

* commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1':
  rtmpproto: send swfverify value as swfurl if latter is unused

This commit is a noop, see c0b3781bf2fef529d64af0e36ea84c0a34522367

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] nsvdec: don't ignore the return value of av_get_packet()

[Sean McGovern]

ffmpeg | branch: master | Sean McGovern  | Fri Mar 24 
13:36:51 2017 -0400| [fe6eea99efac66839052af547426518efd970b24] | committer: 
Sean McGovern

nsvdec: don't ignore the return value of av_get_packet()

Fixes invalid reads with corrupted files.

CC: libav-sta...@libav.org
Bug-Id: 1039

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

 libavformat/nsvdec.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index c91d2a15dd..924c8694b1 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -520,6 +520,7 @@ static int nsv_read_chunk(AVFormatContext *s, int 
fill_header)
 uint32_t vsize;
 uint16_t asize;
 uint16_t auxsize;
+int ret;
 
 if (nsv->ahead[0].data || nsv->ahead[1].data)
 return 0; //-1; /* hey! eat what you've in your plate first! */
@@ -571,7 +572,8 @@ null_chunk_retry:
 if (vsize && st[NSV_ST_VIDEO]) {
 nst = st[NSV_ST_VIDEO]->priv_data;
 pkt = &nsv->ahead[NSV_ST_VIDEO];
-av_get_packet(pb, pkt, vsize);
+if ((ret = av_get_packet(pb, pkt, vsize)) < 0)
+return ret;
 pkt->stream_index = st[NSV_ST_VIDEO]->index;//NSV_ST_VIDEO;
 pkt->dts = nst->frame_offset;
 pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_PKT_FLAG_KEY : 0; 
/* keyframe only likely on a sync frame */
@@ -615,7 +617,8 @@ null_chunk_retry:
bps, channels, samplerate);
 }
 }
-av_get_packet(pb, pkt, asize);
+if ((ret = av_get_packet(pb, pkt, asize)) < 0)
+return ret;
 pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO;
 pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_PKT_FLAG_KEY : 0; 
/* keyframe only likely on a sync frame */
 if( nsv->state == NSV_HAS_READ_NSVS && st[NSV_ST_VIDEO] ) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'fe6eea99efac66839052af547426518efd970b24'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 19:58:04 
2017 -0300| [ce1b1f00bdbe257bf81394f90373940227506c08] | committer: James Almer

Merge commit 'fe6eea99efac66839052af547426518efd970b24'

* commit 'fe6eea99efac66839052af547426518efd970b24':
  nsvdec: don't ignore the return value of av_get_packet()

This commit is a noop, see
edf1cb7aeea0f8fe0e3e785648a30a7ed99defd0
8d7ce5cdb707d4b22749f72d3f118e62e2b95cd3

Merged-by: James Almer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: Disable inline assembly for PathScale compilers

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun  | Fri Mar 24 
20:30:22 2017 +0100| [75ef91543422049a01b594925fcdb182ea12eb09] | committer: 
Diego Biurrun

configure: Disable inline assembly for PathScale compilers

These compilers pass the inline assembly check, but fail to compile
our inline assembly in various ways.

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

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index d9609fc51a..2d84700fc7 100755
--- a/configure
+++ b/configure
@@ -5074,6 +5074,7 @@ elif enabled tms470; then
 disable inline_asm
 elif enabled pathscale; then
 add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
+disable inline_asm
 elif enabled_any msvc icl; then
 enabled x86_32 && disable aligned_stack
 enabled_all x86_32 debug && add_cflags -Oy-

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '75ef91543422049a01b594925fcdb182ea12eb09'

[James Almer]

ffmpeg | branch: master | James Almer  | Mon Oct 23 20:46:55 
2017 -0300| [acf70639fb534a4ae9b1e4c76153f0faa0bda190] | committer: James Almer

Merge commit '75ef91543422049a01b594925fcdb182ea12eb09'

* commit '75ef91543422049a01b594925fcdb182ea12eb09':
  configure: Disable inline assembly for PathScale compilers

Merged-by: James Almer 

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

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index ae46567751..7a53bc76c7 100755
--- a/configure
+++ b/configure
@@ -6553,6 +6553,7 @@ elif enabled tms470; then
 disable inline_asm
 elif enabled pathscale; then
 add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
+disable inline_asm
 elif enabled_any msvc icl; then
 enabled x86_32 && disable aligned_stack
 enabled_all x86_32 debug && add_cflags -Oy-


==


___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog