Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'

* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
  lavf: Add DSS demuxer

Conflicts:
libavformat/Makefile
libavformat/version.h

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

Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'

* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
  lavc: Add DSS SP decoder

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h

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

Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'

* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
  qsv_api: fix building with libmfx disabled

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

Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'

* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
  configure: add missing h264_qsv hwaccel deps

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

Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'

* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
  lavc: add an Intel libmfx-based H.264 decoder

Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h

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

Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'

* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
  h264_parser: export video format and dimensions

Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h

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

Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'

* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
  pixfmt: add a pixel format for QSV hwaccel

Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h

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

lavf: Add DSS demuxer

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

lavc: Add DSS SP decoder

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

qsv_api: fix building with libmfx disabled

configure: add missing h264_qsv hwaccel deps

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  doc/faq: explain DAR/SAR preserving.
  doc: set documentencoding on toplevel texi files.

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

avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom.

On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.

Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.

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

lavc: add an Intel libmfx-based H.264 decoder

Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.

h264_parser: export video format and dimensions

pixfmt: add a pixel format for QSV hwaccel

doc/faq: explain DAR/SAR preserving.

doc: set documentencoding on toplevel texi files.

Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.

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

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

This is similar to a00bab347518d4824d51ec7078f1d84ca097c53b

Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'

* commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
  rv40: Return more meaningful error codes

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

rv40: Return more meaningful error codes

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

avcodec/wmalosslessdec: use sizeof() instead of a literal number

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

avfilter/vf_subtitles: Add () to protect the argument of the AA() macro

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

avutil/sha: Protect macro arguments with ()

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

ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs

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

Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'

* commit 'd617e77cecc5b363ef1860955b548f4ac007add6':
  libx265: Add crf private option

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

Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'

* commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
  libx265: Reduce the scope of some variables

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

tests: fate: adding fate-test for twofish

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenc: Fix use of uninitialized variable (ret)

Fixed CID1270823

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

libx265: Add crf private option

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Reduce the scope of some variables

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Add crf private option

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Reduce the scope of some variables

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory

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

avformat/ffmenc: Fix memleak of buf

Fixes CID1257015

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

avfilter/showpalette: fix leak in case of error

Fixes CID1270820
Fixes CID1270818

avfilter/palettegen: fix leak in case of error

avfilter/paletteuse: fix leak in case of error

Fixes CID1270819

avfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx()

Fixes CID1270822

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

avfilter/vf_qp: Fix leak of out_qp_table_buf

Fixes CID1270821

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

avfilter/avfiltergraph: assert that the heap_bubble index is valid

This might help coverity

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

avcodec/faxcompr: Fix memleak

Fixes CID1270816

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

avcodec/opusdec: remove unused headers

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/vf_removelogo: Add () to protect the argument of apply_mask_fudge_factor()

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

swscale/bayer_template: Add () to protect the argument of BAYER_READ()

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

compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments

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

avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()

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

avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()

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

libavutil: optimize twofish cipher

before:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   90.052 +- 4.630
after:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   18.085 +- 0.241
gcrypt     TWOFISH      size: 1048576  runs:   1024  time:   25.666 +- 0.307
tomcrypt   TWOFISH      size: 1048576  runs:   1024  time:   18.428 +- 0.363

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'

* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
  riff: Support QT RLE Animation in avi ('rle ' FourCC)

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

Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'

* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
  riff: Support ProRes in avi (APCH fourcc)

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

Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'

* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
  wmv2: Return meaningful error codes

Conflicts:
libavcodec/wmv2dec.c

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

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>

riff: Support QT RLE Animation in avi ('rle ' FourCC)

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

riff: Support ProRes in avi (APCH fourcc)

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

wmv2: Return meaningful error codes

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>