Merge commit '84d173d3de97c753234ab0c0b50551d51413d663'

* commit '84d173d3de97c753234ab0c0b50551d51413d663':
  xvididct: Ensure that the scantable permutation is always set correctly

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

Merge commit '6f1960ab71b4f18551243ce22d01913108265233'

* commit '6f1960ab71b4f18551243ce22d01913108265233':
  idct: cosmetics: Drop one unnecessary if-block level

Conflicts:
libavcodec/idctdsp.c

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

Merge commit '444c73583d2848a542330c03949e1f933ac68f53'

* commit '444c73583d2848a542330c03949e1f933ac68f53':
  configure: Only run gas checks on ARM and PowerPC

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

Merge commit '0026e356d044e72b6e743b234708b8b8af457ac0'

* commit '0026e356d044e72b6e743b234708b8b8af457ac0':
  configure: Die if gas is unavailable under aarch64 as well as ARM

Conflicts:
configure

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

Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'

* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472':
  mpeg: K&R formatting cosmetics

Conflicts:
libavformat/mpegenc.c

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

Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'

* commit '454697603e4efdfc04fadec40518d56c7dc1e5dd':
  mpegts: Use av_free() to free memory allocated by av_strdup()

Conflicts:
libavformat/mpegtsenc.c

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

avformat/matroskadec: Check avpriv_new_chapter() for failure

Fixes null pointer dereference

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

xvididct: Ensure that the scantable permutation is always set correctly

This fixes cases where the scantable permuation would get overwritten by
the general idctdsp initialization.

idct: cosmetics: Drop one unnecessary if-block level

avfilter/dctdnoiz: use 32-bit (float) operations instead of 64 (double) for DCTs

This makes the code about 1.5x faster without any noticeable difference
in the output.

avfilter/dctdnoiz: remove forward declarations after previous commit

avfilter/dctdnoiz: make color [de]correlation less clumsy

This has no impact on overall performance, since the block DCT taking
most of the time anyway.

avfilter/showcqt: add and extend tlength and volume options

Add a tlength option with frequency and timeclamp variable

Add to the volume option support for frequency and timeclamp variable,
   a_weighting, b_weighting and c_weighting functions

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

avformat/mov: Support reading Avid's metadata for DNXHD codec.

The AALP atom is necessary to properly decode the alpha channel.
Needed for ticket #3707

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

Autodetect webp files.

configure: Check if libwebp compilation will succeed.

configure: Only run gas checks on ARM and PowerPC

Standalone GNU assembly is not used on x86.

configure: Die if gas is unavailable under aarch64 as well as ARM

mpeg: K&R formatting cosmetics

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

mpegts: Use av_free() to free memory allocated by av_strdup()

replace calls to url_feof() with avio_feof()

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

lavf/avio: rename url_feof() to avio_feof()

It's a public function and should use the avio_ namespace

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

avformat/mov: read reel_name metadata from tmcd atom

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

avformat/mpegtsenc: Use av_freep() for pids

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

avformat/mpegtsenc: Free services array completely on failure

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

avformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation

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

mpegtsenc: Check dynarray_add() for failure

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

avformat/mpegtsenc: use the correct deallocation functions

Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'

* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
  mpegts: Fix memory leaks and related crashes in mpegs_write_header()

Conflicts:
libavformat/mpegtsenc.c

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

Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'

* commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc':
  mpegts: Avoid unnecessary variable shadowing

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

Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'

* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
  mpegts: Drop some unnecessary parentheses

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

avfilter/dctdnoiz: add 8x8 dct and make it the default

8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.

Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'

* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
  mpegts: K&R formatting cosmetics

Conflicts:
libavformat/mpegtsenc.c

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

doc/APIchanges: Correct function reference.

The commit bb789016d423d2cfacd2904ac66257bdf7f0964e
un-deprecated sws_getContext()

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

Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
  swscale: Undeprecate sws_getContext()

Conflicts:
libswscale/version.h

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

Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
  avcodec: Undeprecate reordered_opaque

Conflicts:
doc/APIchanges
libavcodec/version.h

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

Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'

* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651':
  h264: fix interpretation of interleved stereo modes

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

avformat/movenc: XMP metadata support.

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

avformat/mov: XMP metadata suppor.

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

avfilter/dctdnoiz: rewrite [f/i]dct

This removes the avcodec dependency and make the code almost twice as
fast. More to come.

The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).

mpegts: Fix memory leaks and related crashes in mpegs_write_header()

mpegts: Avoid unnecessary variable shadowing

mpegts: Drop some unnecessary parentheses

mpegts: K&R formatting cosmetics

avdevice/lavfi: Simplify non-AV stream check

Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not automatically map subtitles if the decoder and encoder properties are different.

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

lavf: remove nonexistent functions from the version file

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

lavc: remove nonexistent functions from the version file

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

Do not automatically map subtitles if the decoder and encoder properties are different.

Fixes ticket #3819.

lavd/dshow: use av_codec_get_id()

ff_codec_get_id() is a lavf internal function

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

swscale: Undeprecate sws_getContext()

sws_getCachedContext is not a full replacement for the function.

avcodec: Undeprecate reordered_opaque

It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts.  There is no way to cleanly achieve this
without the field.

avcodec/raw: add avpriv_get_raw_pix_fmt_tags()

Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries

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

h264: fix interpretation of interleved stereo modes

Column and row frame packing arrangements were inverted.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.

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

lavf/mpegts: Do not return the result of a (void) function from a void function.

Fixes compilation with Sun C 5.10.

Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.

This is a workaround for the issue that stream probing can use
the score of another codec type for mpeg stream autodetection.
Fixes ticket #3821.

lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()

The were wrongly being exported and used by libavdevice

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

Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'

* commit 'b50173a4dd47b9c3c89845b781fa958ccf860929':
  movenc: fix QT chapter track character encoding

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

Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'

* commit 'da9cc22d5bd5f59756c2037b02966376da2cf323':
  movenc: add track title to tracks

Conflicts:
libavformat/movenc.c

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

Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'

* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed':
  movenc: remove pointless loop around BITEXACT test

Conflicts:
libavformat/movenc.c

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

avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"

Add padding, clear size, use the correct pointer.

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

Merge commit '7b588bb691644e1b3c168b99accf74248a24e3cf'

* commit '7b588bb691644e1b3c168b99accf74248a24e3cf':
  svq1: do not modify the input packet

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

Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36'

* commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36':
  cdgraphics: do not return 0 from the decode function

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

Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'

* commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812':
  cdgraphics: switch to bytestream2

Conflicts:
libavcodec/cdgraphics.c

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

libavcodec/rawdec: remove old ff_find_pix_fmt() function

It's been dead code for more than a year

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

avformat/dtsdec: check more of the dca headers in dts_probe()

Fixes misdetection of 664461_flac_16_44100_2.wav
Fixes Ticket3830

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

avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe()

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

movenc: fix QT chapter track character encoding

An encoding ("encd") box is required to tell QT that the string is UTF8

movenc: add track title to tracks

movenc: remove pointless loop around BITEXACT test

svq1: do not modify the input packet

The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.

Also, check the size of the header, avoiding invalid reads on truncated
data.

CC:libav-stable@libav.org

Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'

* commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f':
  configure: Include the armcc build number in the compiler identification

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

cdgraphics: do not return 0 from the decode function

0 means no data consumed, so it can trigger an infinite loop in the
caller.

CC:libav-stable@libav.org

cdgraphics: switch to bytestream2

Fixes possible invalid memory accesses on corrupted data.

CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674

Merge commit 'cbc808d726afdf53d866264722785c1304c17390'

* commit 'cbc808d726afdf53d866264722785c1304c17390':
  jpeg2000: enable 4 component pixel formats

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

x86: sbrdsp/fft: reuse ps_neg constant

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

x86: diracdsp: reuse constants

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

x86: dwt: better share constants

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

x86: better share ff_pw_2

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

x86: vpx/h264/hevc/mpeg2: share constants

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

configure: Include the armcc build number in the compiler identification

This tries to find the most expressive part of the output of
armcc --vsn to include, giving a compiler identification of
"ARM Compiler 5.04 update 2 (build 82)" instead of just
"ARM Compiler 5.04" for armcc 5.0.

4.x versions of armcc output the following, for "armcc --vsn":
ARM C/C++ Compiler, RVCT4.0 [Build 925]
For evaluation purposes only
Software supplied by: ARM Limited

ARM C/C++ Compiler, 4.1 [Build 894]
For evaluation purposes only
Software supplied by: ARM Limited

5.0 versions output this:
Product: ARM Compiler 5.04
Component: ARM Compiler 5.04 update 2 (build 82)
Tool: armcc [5040081]
For evaluation purposes only
Software supplied by: ARM Limited

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

avcodec: Change get_pixels() to ptrdiff_t linesize

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

avutil/cpu: check av_parse_cpu_caps() table during cpu-test

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

avutil/cpu: Make cpu flag names match between cpu-test and av_parse_cpu_caps() tables

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

avutil/cpu: add aarch64 entries to 2nd table

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

jpeg2000: enable 4 component pixel formats

Bug-Id: 721
CC: libav-stable@libav.org
Sample-Id: 31230.mov

hevc_deblock: change tc type

The x86 asm expects int32_t so use that type.

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

transcode_aac: fix const return value

Fixes Trac #3613.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/muxers: document which applications are known to need disable_chpl.

Thanks to: John Stebbins <stebbins@jetheaddev.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/cpu: output cpu data to stdout

Errors go to stderr, but the cpu stats are non error output for cputest

This fixes echoing the cpu test results

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

tests/fate/libavutil: switch cpu-test back to runecho so its results are vissible

(needs next commt too)

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

avutil/pixelutils: check for malloc failure

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

avutil/pixelutils: avoid on stack arrays

The arrays are fairly large and could cause problems on some embedded systems
also they are not endian safe as they mix 32 and 8bit

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

avutil/cpu: fix cpu-test to work with ffmpegs cpuflags syntax

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

Merge commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb'

* commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb':
  huffyuvdec: check width size for yuv422p

Conflicts:
libavcodec/huffyuvdec.c

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

Merge commit '70cd3b8e659c3522eea5c16a65d14b8658894a94'

* commit '70cd3b8e659c3522eea5c16a65d14b8658894a94':
  mmvideo: check horizontal coordinate too

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

huffyuvdec: check width size for yuv422p

Avoid out of array accesses.

CC: libav-stable@libav.org
Bug-Id: CVE-2013-0848
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

mmvideo: check horizontal coordinate too

Fixes out of array accesses.

Bug-Id: CVE-2013-3672
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

avfilter/select: fix "t" eval variable comment