lavfi/colormatrix: add support for named options

lavfi/tinterlace: use standard options parsing.

lavfi/subtitles: use standard options parsing.

lavfi/smartblur: use standard options parsing.

lavfi/setfield: use standard options parsing.

lavfi/overlay: use standard options parsing.

lavfi/kerndeint: use standard options parsing.

lavfi/idet: use standard options parsing.

lavfi/histeq: use standard options parsing.

lavfi/gradfun: use standard options parsing.

lavfi/geq: use standard options parsing.

lavfi/fieldorder: use standard options parsing.

lavfi/field: use standard options parsing.

lavfi/deshake: use standard options parsing.

lavfi/cropdetect: use standard options parsing.

lavfi/boxblur: use standard options parsing.

lavfi/blackframe: use standard options parsing.

lavfi/settb: use standard options parsing.

lavfi/select: use standard options parsing.

lavfi/perms: use standard options parsing.

lavfi/sine: use standard options parsing.

lavfi/apad: use standard options parsing.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Change a missed occurrance of int to ptrdiff_t for strides
  x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function
  bktr: Add missing includes for av_gettime()
  fate: use little endian yuv444p10 in h264-reinit tests

Nothing changes through this merge as the 3 bugfixes already exist
in ffmpeg and the clobbering wraper is still in use as we did not
yet remove avcodec_encode_video

Merged-by: Michael Niedermayer <michaelni@gmx.at>

x86: Change a missed occurrance of int to ptrdiff_t for strides

Signed-off-by: Martin Storsjö <martin@martin.st>

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: avoid frame data leak on early frame drop

Merged-by: Michael Niedermayer <michaelni@gmx.at>

rawdec: fix memleak

Fixes fate-lavf-flm under valgrind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/buffer: remove redundant memory poisoning

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/buffer: support memory poisoning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

yop: use reget_buffer() as the previous contents are used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: dont try to filter partial frames with yadif.

The partial frames leak a few uninitialized pixels through
due to incomplete interlaced error concealment support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

buffersink/uninit: use av_frame_free() not unref

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function

Signed-off-by: Martin Storsjö <martin@martin.st>

bktr: Add missing includes for av_gettime()

This is necessary after the old av_gettime in libavformat was
dropped.

Signed-off-by: Martin Storsjö <martin@martin.st>

fate: use little endian yuv444p10 in h264-reinit tests

Fixes fate big endian configs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

h264: dont report rows as finished after a missing slice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/anullsrc: add missing checks

lavfi/anullsrc: remove extra parentheses

lavfi/anullsrc: simplify logging code in config_props

lavfi/anullsrc: fix format negotiation

Samplerate and channel layouts must be set in query_formats.

mips: Optimization of AAC psychoacoustic model functions

Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libspeex: support ZygoAudio (quality 10 mode)

Fixes "quality 10" mode from Ticket1873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavd/v4l2: honor previously selected input channel

An input channel could have been previously set with another application, like
v4l2-ctl, so if no input channel is specified use the previosly selected one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Make audio FIFO read/write contracts more strict

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: use little endian yuv444p10 in h264-reinit tests

Fixes fate big endian configs.

Call do_video_stats when duplicating frame

When multiple frame are encoded during vsync, current code only
do_video_stats once. This need to do it every frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add test for cropping h264 to container dimensions
  FATE: add a tscc2 test.
  tscc2: allocate AVFrame properly.

Conflicts:
libavcodec/tscc2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '20a8ee3061e6d777600c13db731bee3c25878991'

* commit '20a8ee3061e6d777600c13db731bee3c25878991':
  af_asyncts: fix compensation and PTS monotonicity

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'

* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6':
  avutil/frame: add all remaining frame properties to av_frame_copy_props

Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: Correct inter stream timestamp discontinuities

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffplay: avoid frame data leak on early frame drop

Signed-off-by: Marton Balint <cus@passwd.hu>

Changelog: add WebP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/blend: always peek the first frame of each queue.

Before the change, filter_frame() always waited for 2 samples in the
bottom frames queue. This notably fixes commands such as
./ffplay tests/lena.pnm -vf split,blend=c0_mode=addition

lavc/prores: restore pict_type and key_frame setting.

x86/mpegvideo: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86/h264_qpel: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: add test for cropping h264 to container dimensions

Tests the workaround added for 1080 videos created with Canon cameras
in 30f515091c323da59c0f1b533703dedca2f4b95d.

Fix typo in dvvideo decoder dependencies.

Fixes compilation with --disable-everything --enable-decoder=dvvideo

FATE: add a tscc2 test.

tscc2: allocate AVFrame properly.

af_asyncts: fix compensation and PTS monotonicity

This patch improves af_asyncts behavior on streams with bogus PTS, which
are either non-monotonic, or contain PTS jitter, and trigger the
non-monotonicity error. With this patch, af_asyncts is able to correct
these streams and avoid the error.

Firstly, it fixes resample compensation calculation by supplying proper
units to avresample_set_compensation (sample count per second instead
of sample count per some arbitrary frame size). Also, the calculation of
the compensation itself is fixed - delta is proportional to an adjustment
of the compensation, not the compensation itself. Ideally, the compensation
should converge to a value that keeps delta at zero.

To be able to deal with sources with PTS jitter even without resampling,
small PTS errors are adjusted, so the output frames do not overlap.

Finally, one more monotonicity check is added.

The FATE reference changes because now there is 8 less samples of
silence because of the pts jitter.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>

avutil/frame: add all remaining frame properties to av_frame_copy_props

Signed-off-by: Anton Khirnov <anton@khirnov.net>

h263dec: switch to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskadec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vp8: WebP decoding support

VP8L, padding and bounds checks by Pascal Massimino

Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

img2: WebP support

Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix compilation with --disable-everything --enable-parser=h264.

Fix compilation with --disable-mmx.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Enable hwaccels without external dependencies by default.
  doc/developer: Clarify symbol naming prefixes section.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavu/eval: add between() function.

Do not fail in get_buffer_internal() if pix_fmt planes == 0.

Fixes VDPAU decoding, reported by Ilja Sekler

error_resilience: fix const correctness, silence warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI

This might fix a compatibility issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vda_h264: fix for VDA compile

the VDA code needs to be updated to use the CHROMA(h) macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sonicdec: update to new buffer API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sonicenc: fix mono decorrelation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sonicdec: fix frame size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sonicdec: check decorrelation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

g729dec: switch to buffer refs style

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

v308dec: remove unneeded self assignment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: Enable hwaccels without external dependencies by default.

doc/developer: Clarify symbol naming prefixes section.

ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

h264: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

h264: add an argument to CHROMA for consistency

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: remove redundant freeing of DPB in h264_decode_end

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'

* commit '23e85be58fc64b2e804e68b0034a08a6d257e523':
  h264: add a parameter to the CHROMA444 macro.
  h264: add a parameter to the CHROMA422 macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'

* commit '6d2b6f21eb45ffbda1103c772060303648714832':
  h264: add a parameter to the CABAC macro.
  h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'

* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
  h264: add a parameter to the FIELD_PICTURE macro.
  h264: add a parameter to the FRAME_MBAFF macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'

* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
  h264: add a parameter to the MB_FIELD macro.
  h264: add a parameter to the MB_MBAFF macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'

* commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67':
  h264: merge common_init() into ff_h264_decode_init.

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'

* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
  h264: make ff_h264_frame_start static.

Conflicts:
libavcodec/h264.c
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'

* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
  fate: add tests for h264 decoder reinit
  h264: fix bit depth changes with frame threading

Merged-by: Michael Niedermayer <michaelni@gmx.at>

h264: drop special case for 9bit chroma422

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

h264: remove redundant freeing of DPB in h264_decode_end

free_tables() frees it already.

h264: add a parameter to the CHROMA444 macro.

This way it does not look like a constant.

h264: add a parameter to the CHROMA422 macro.

This way it does not look like a constant.

h264: add a parameter to the CABAC macro.

This way it does not look like a constant.

h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.

This way it does not look like a constant.

h264: add a parameter to the FIELD_PICTURE macro.

This way it does not look like a constant.

h264: add a parameter to the FRAME_MBAFF macro.

This way it does not look like a constant.