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

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

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

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

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

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

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

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

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

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

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

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

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>

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

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

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>

(needs next commt too)
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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>

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

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

Conflicts:
	libavcodec/huffyuvdec.c

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

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

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

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>

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>

This was probably a mistake with mpdecimate. The decimate filter doesn't
depend on avcodec.

* commit '849b9d34':
  wmalosslessdec: fix mclms_coeffs* array size

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

* commit '15201e25':
  configure: check $as first before using $gas as GNU as

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

* commit 'd395895c':
  fate: generate tests/pixfmts.mak for all targets requiring it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes corruption of context

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Bug-Id: CVE-2014-2098
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0897d2fd':
  movenc: Add option to disable nero chapters

Conflicts:
	doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2601a944':
  mpegts: Add HEVC definitions

Conflicts:
	libavformat/mpegts.h

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

* commit '89616408':
  mpegts: Define the section length with a constant
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '701e8b42':
  vc-1: Optimise parser (with special attention to ARM)

Conflicts:
	libavcodec/vc1_parser.c

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