* commit '00a0419c':
  mathematics: Kill non-compiling disabled cruft

This commit is a noop, see 1e1513d0Merged-by: NClément Bœsch <u@pkh.me>

* commit '5a667322':
  vaapi_vc1: Remove redundant version check

This commit is a noop, see d07d01bcMerged-by: NClément Bœsch <u@pkh.me>

* commit '01d6f84f':
  vaapi_vc1: Constify pointers

This commit is a noop, see 845c2c14Merged-by: NClément Bœsch <u@pkh.me>

* commit 'ee906129':
  vaapi_mpeg2: Constify pointers

This commit is a noop, see 6bc2808cMerged-by: NClément Bœsch <u@pkh.me>

* commit '03adfe91':
  vaapi_h264: Constify pointers

This commit is a noop, see d0897da9Merged-by: NClément Bœsch <u@pkh.me>

* commit '121f34d5':
  hwcontext_vaapi: Try the first render node as the default DRM device

This commit is a noop, see 8d47d840Merged-by: NClément Bœsch <u@pkh.me>

* commit '6fc944e6':
  Prepare for 12_alpha1 Release

This commit is a noop.
Merged-by: NClément Bœsch <u@pkh.me>

* commit 'f6d2fed8':
  avconv: Make sure that inputless filtergraphs are configured

This commit is a noop. Related code is pretty different in ffmpeg, and
-filter_complex testsrc works.

See also af1761f7Merged-by: NClément Bœsch <u@pkh.me>

* commit '602abe77':
  avconv: Check the fifo allocation

This commit is a noop, see af1761f7Merged-by: NClément Bœsch <u@pkh.me>

* commit 'f2143c57':
  vp9: reindent after last commit
  vp9: add frame threading
  vp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically.
  vp9: split last/cur_frame from the reference buffers.

This commit is a noop, we already have all these changes. Again, we will
need in the future to analyse the tiny differences between the two
repository on the vp9 files. But in the current state, it's a real pain
to do at every commit due to the huge differences (such as files split
and cosmetics).
Merged-by: NClément Bœsch <u@pkh.me>

* commit '04763c6f':
  h264_direct: use the reference mask from the actual reference

This commit is a noop, see d8151a7eMerged-by: NClément Bœsch <u@pkh.me>

* commit 'e9bfff1c':
  lavc: free buffer_frame/pkt on avcodec_open2() failure

This commit is a noop, see 27adf9f9.

Only reordered to reduce diff.
Merged-by: NClément Bœsch <u@pkh.me>

* commit 'ec021d48':
  buffer: fix av_buffer_pool_init2() documentation
Merged-by: NClément Bœsch <u@pkh.me>

The typeof keyword is apparently not available when using the -std=c99 option.

Fixes the use of C11 atomic functions with old GCC.
Reviewed-by: NMuhammad Faiz <mfcc64@gmail.com>
Signed-off-by: NJames Almer <jamrial@gmail.com>

Not used by anything at all since we don't auto insert lavr filters.
Reviewed-by: Nwm4 <nfxjfg@googlemail.com>
Signed-off-by: NRostislav Pehlivanov <atomnuker@gmail.com>

use fltp when doing s32 -> s32 resampling
because s32p has no simd optimization

benchmark:
old 17.913s
new  7.584s (use fma3)
Reviewed-by: Nwm4 <nfxjfg@googlemail.com>
Signed-off-by: NMuhammad Faiz <mfcc64@gmail.com>

Fixes a gcc warning:
libavcodec/bitstream_filter.c:71:20: warning: assignment discards 'const' qualifier from pointer target type

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 <michael@niedermayer.cc>.
Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

This field is of little value, and interferes with testing side data,
since sizes can be different on multiple architectures.
Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

* commit '0638b99c':
aiff: Skip padding byte for odd-sized chunks

Also removes to odd-size checks from get_aiff_header and get_meta to use
the generic path introduced by the original commit.
Merged-by: NMatthieu Bouron <matthieu.bouron@gmail.com>

Allows to get a more realistic total bitrate (and estimated file size)
in avi_write_header. Previously a static default value of 200k was
assumed.

Adds an internal helper function for bitrate guessing.
Signed-off-by: NTobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc>

(cherry picked from Libav commit d10102d2)
Signed-off-by: NTobias Rapp <t.rapp@noa-archive.com>

Signed-off-by: NTimo Rothenpieler <timo@rothenpieler.org>

when set_compensation is called with zero sample_delta,
compensation does not happen (because dst_incr == ideal_dst_incr)
but compensation_distance is set

regression since 01ebb57cFound-by: Nwm4 <nfxjfg@googlemail.com>
Reviewed-by: Nwm4 <nfxjfg@googlemail.com>
Signed-off-by: NMuhammad Faiz <mfcc64@gmail.com>

This cna happen if the user tries to call the new decode API for
subtitles.

Fixes CID 1402071.

Reflects the actual code and silences a gcc warning:
ffprobe.c:1797:42: warning: passing argument 1 of 'av_spherical_tile_bounds' discards 'const' qualifier from pointer target type

* commit '0df48011':
  vp9: make mv bounds 32bit.

This commit is a noop, see 024fac5cMerged-by: NClément Bœsch <u@pkh.me>

* commit '24a36256':
  buffer: fix av_buffer_realloc() when the data is offset wrt buffer start
Merged-by: NClément Bœsch <u@pkh.me>

Fixes a gcc warning:
libavcodec/utils.c:2244:26: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

Reflects the actual code and silences a gcc warning:
libavcodec/utils.c:2102:36: warning: passing argument 1 of 'av_packet_get_side_data' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

Add missing options.
List correct variable types.
Re-order options and markup flag options properly.
Add more texinfo markup.
Signed-off-by: NLou Logan <lou@lrcd.com>

pcr_period is in milliseconds.
Signed-off-by: NLou Logan <lou@lrcd.com>

* commit 'e99ecda5':
  checkasm: add vp9 MC tests.
  vp9mc/x86: sse2 MC assembly.
  vp9mc/x86: add AVX and AVX2 MC
  vp9mc/x86: rename ff_* to ff_vp9_*
  vp9mc/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext
  vp9mc/x86: simplify a few inits.
  vp9mc/x86: add 16px functions (64bit only).

Noop (aside from a formatting comment in vp9mc.asm). We already have all
of this. We should consider making a final diff between the two projects
when the dust comes down.
Merged-by: NClément Bœsch <u@pkh.me>

* commit '89466de4':
  vp9/x86: rename vp9dsp to vp9mc

File was already renamed, only the top description is updated.
Merged-by: NClément Bœsch <u@pkh.me>

better quality without speedloss
Signed-off-by: NMuhammad Faiz <mfcc64@gmail.com>