Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'

* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
  qdm2: Return meaningful error codes

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

Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'

* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
  libxvid: Return meaningful error messages

Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c

See: 2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure

This keeps the fields consistent

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

Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'

* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
  aac_adtstoasc_bsf: Check extradata memory allocation

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

Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'

* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
  avpacket: Check buffer reference

Conflicts:
libavcodec/avpacket.c

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

Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'

* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
  vorbisdec: Check memory allocations

Conflicts:
libavcodec/vorbisdec.c

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

Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'

* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
  dvdsubdec: Check memory allocations

Conflicts:
libavcodec/dvdsubdec.c

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

Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'

* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
  swscale: Check memory allocations

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

Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7'

* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
  nutdec: Check memory allocations

Conflicts:
libavformat/nutdec.c

See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenc: Fix stts_entries allocation check

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

Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'

* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
  movenc: Check memory allocations

Conflicts:
libavformat/movenc.c

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

Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'

* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()

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

Merge commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52'

* commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52':
  dct-test: Fix initialization syntax

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

Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'

* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
  lavf: Document the codec context initialization

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

Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'

* commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
  lavc: Document interaction between avcodec_open2() and decoding routines

Conflicts:
libavcodec/avcodec.h

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

Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'

* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
  avplay: Check format allocation inside decode_thread()

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

Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'

* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
  avplay: Check frame allocation inside video_thread()

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

Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'

* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
  avconv: Check rc_override memory allocation

Conflicts:
ffmpeg_opt.c

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

Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'

* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
  graphparser: Check av_get_token() memory error

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

avformat/matroskaenc: Use the correct data type for the chapter times

Fixes potential integer overflow

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

Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'

* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
  matroskaenc: Validate chapter start and end times

Conflicts:
libavformat/matroskaenc.c

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

Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'

* commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
  dca: Remove separate header for DCA ExSS

Conflicts:
libavcodec/dca.h
libavcodec/dca_exss.h

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

avcodec/vp56: Add () to protect TRANSPOSE()s arguments

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

qdm2: Return meaningful error codes

libxvid: Return meaningful error messages

aac_adtstoasc_bsf: Check extradata memory allocation

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

avpacket: Check buffer reference

CC: libav-stable@libav.org
Bug-Id: CID 1267889

vorbisdec: Check memory allocations

dvdsubdec: Check memory allocations

swscale: Check memory allocations

CC: libav-stable@libav.org
Bug-Id: CID 1267888 / CID 1267890
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

nutdec: Check memory allocations

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

movenc: Check memory allocations

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

rmdec: Check memory allocations from ff_rm_alloc_rmstream()

Bug-Id: CID 1257835

dct-test: Fix initialization syntax

Related to "warning: suggest braces around initialization of subobject".

lavf: Document the codec context initialization

During remuxing avcodec_copy_context() is discouraged as certain fields
(such as codec_tag) could reflect invalid values between input and
output contextes.

lavc: Document interaction between avcodec_open2() and decoding routines

avplay: Check format allocation inside decode_thread()

CC: libav-stable@libav.org
Bug-Id: CID 1265718

avplay: Check frame allocation inside video_thread()

CC: libav-stable@libav.org
Bug-Id: CID 1267893

avconv: Check rc_override memory allocation

CC: libav-stable@libav.org
Bug-Id: CID 1265719

graphparser: Check av_get_token() memory error

CC: libav-stable@libav.org
Bug-Id: CID 1267891

matroskaenc: Validate chapter start and end times

CC: libav-stable@libav.org
Bug-Id: CID 1265717

avfilter/paletteuse: raise cache size from 64k to 512k

(or 32k to 256k in 32-bit)

x86: hevc_mc: fewer xmm regs used in epel h/v

11 xmm regs seem only required for avx2.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Force linking against user32 if dxva2 is enabled.

Fixes compilation with vfwcap disabled.
Reported and tested by Bernhard Döbler, programmer bardware de

Reviewed-by: Matt Oliver

x86/doc/Makefile: DBG=1 to preprocess external asm

The macro hell sometimes make it difficult to trace the source of
an error, so it is easier to analyze the preprocessed output.

This patch makes this automatical by specifying DBG=1 on the
command line: a file ffmpeg/dir/file.asm gets preprocessed to
builddir/dir/file.dbg.asm, which is then compiled.

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

x86inc: Correctly warn on use of SSE2 instructions in SSE functions

SSE2 instructions that are XMM-implementations of pre-existing MMX/MMX2
instructions did not issue warnings when used in SSE functions. Handle
it by also checking the register type when such instructions are used.

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

avfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro

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

avfilter/vf_phase: Add () to protect DIFF()s arguments

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

swresample/resample_template: Add () to protect the arguments of the OUT() macro

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

avutil/aes: Add () to protect the ROT() arguments

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

avutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments

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

avutil/intmath: Add () to protect the ff_log2() argument

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

avutil/murmur3: Add () to protect the ROT() arguments

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

avutil/version: Add () to protect the AV_VERSION_INT() arguments

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

avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE()

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

avutil/log: add () to protect the argument of AV_LOG_C()

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

avcodec/vc1dsp: add () to protect the arguments of the op* macros

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

avcodec/ac3: add () to protect the macro arguments

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

avformat/mpc8: Add () to protect MKMPCTAG()s arguments

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

avcodec/me_cmp: add () to protect avg*s arguments

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

avcodec/bmvvideo: Add () to protect NEXT_BYTE()  argument

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

swresample/swresample-test: Add () to protect uint_rand() argument

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

avformat/tls: add () to protect macro arguments

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

avcodec/hevcdsp: add missing () to CMP macro

Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>

x86: hevc_mc: save 1 gpr in epel filter loading

The 3*stride value stored in r3src can be loaded much later,
so use r3src instead of a dedicated gpr when possible.

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

avcodec/hevcdsp: optimize pixel comparison in sao_edge_filter

GCC 4.9.2 on a Core i5-4200U @ 1.60GHz, Linux x86_64

Before
715487 decicycles in sao_edge_filter_8, 262144 runs, 0 skips

After
672104 decicycles in sao_edge_filter_8, 262144 runs, 0 skips

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

hls: fix a null pointer dereference

Not allocating the pls->ctx will crash in libavformat/hls.c:1410, where
it tries to dereference the field.

Sample: http://ec24.rtp.pt/liverepeater/rtpn.smil/playlist.m3u8

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

avcodec/vc1_mc: factor out helper functions for scaling blocks

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

avformat/rtpdec_h264: fix compile failure with -DDEBUG

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

avcodec/gif: fix off by one in column offsetting finding

hevcdsp: HEVC deblocking ARM NEON register clobber fix

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

avcodec/vc1_mc: move median4() to mathops.h

Needed for architecture specific optimizations

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

dca: Remove separate header for DCA ExSS

There is no point in having a separate header for a single declaration.

x86/g722dsp: add ff_g722_apply_qmf_sse2

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'

* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
  bktr: Use av_strerror and propagate error codes

Conflicts:
libavdevice/bktr.c

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

Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'

* commit '3a651f599a18b023602370b67a77eb0efa309b20':
  dca: Move data tables from a header to an object file

Conflicts:
libavcodec/Makefile
libavcodec/dcadata.h
libavcodec/dcadec.c

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

Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'

* commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda':
  dca: Add array sizes to array declarations

Conflicts:
libavcodec/dcadata.h

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

Merge commit '702458538d4e52809bcef460d39baabf061b16b5'

* commit '702458538d4e52809bcef460d39baabf061b16b5':
  g722: Add ARM NEON implementation for g722_apply_qmf()

Conflicts:
libavcodec/arm/Makefile

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

Merge commit '73ae0a9d12857852222363f9a7c14d07058ebfd3'

* commit '73ae0a9d12857852222363f9a7c14d07058ebfd3':
  g722: Split out computation of band->s_zero and unroll code

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

Merge commit 'b16057b5fe9f02442c52388037891c2e381205fc'

* commit 'b16057b5fe9f02442c52388037891c2e381205fc':
  g722: Unroll g722_apply_qmf()

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

Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'

* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
  g722: Reduce number of pointers passed to g722_apply_qmf() function

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

Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'

* commit '67690683130faf37dd9d969ced15eba2a1940ade':
  g722: Split out g722_qmf_apply() function into g722dsp.c

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

avformat/mov: Bypass av_add_index_entry()

The new mov code uses a temporally non sorted index since 4abfa387b8234736f6e0e541951e3d5eb60eb843
and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted.
Reverting 4abfa387b8234736f6e0e541951e3d5eb60eb843 and this commit would be
a alternative fix as would be various other options.

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

Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'

* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
  mov: Change DTS-based seek into CTS-based seek.

Conflicts:
libavformat/mov.c

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

bktr: Use av_strerror and propagate error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>

dca: Move data tables from a header to an object file

This allows sharing them with the DCA XLL extension w/o duplication.

dca: Add array sizes to array declarations

Merge commit '51ca3cb604a7585a7cff35d4b954794508955c19'

* commit '51ca3cb604a7585a7cff35d4b954794508955c19':
  xcbgrab: Use the correct geometry for the region highlight

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

g722: Add ARM NEON implementation for g722_apply_qmf()

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

g722: Split out computation of band->s_zero and unroll code

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

g722: Unroll g722_apply_qmf()

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

g722: Reduce number of pointers passed to g722_apply_qmf() function

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

g722: Split out g722_qmf_apply() function into g722dsp.c

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'

* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6':
  ape: Use the proper variable type

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

Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'

* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
  ogg: check memory allocations

Conflicts:
libavformat/oggenc.c

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

Merge commit '53367b34e1156614e82ef7af888928f322566f88'

* commit '53367b34e1156614e82ef7af888928f322566f88':
  rtp: h264: Drop the asserts

Conflicts:
libavformat/rtpdec_h264.c

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

Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'

* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7':
  rtp: h264: Move FU-A NAL parsing to a function

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

Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'

* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0':
  rtp: h264: Move STAP-A NAL parsing to a function

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

Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'

* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function

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

Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'

* commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c':
  rtp: h264: Move profile_level_id parsing to a function

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