* commit 'db71c492':
  mjpegenc: fix argument size in encode_mb

Conflicts:
	libavcodec/mjpegenc.c
	libavcodec/mjpegenc.h

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

* commit 'f349f4b5':
  mpegvideo: fix size of array

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

* commit '898e9a24':
  mpegvideo: check mpv return value

Conflicts:
	libavcodec/mpegvideo.c

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

* commit 'fe27aeae':
  mpeg12enc: increase declared size of block function argument

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

* commit '52f954da':
  libavcodec: Unconditionally build xiph.o

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Using 100-continue ffmpeg will only send data if the server confirms it,
so if there is an error with auth or mounpoint, this allows that it is
properly reported to the user. Else ffmpeg sends data and just quits at
some point without an error message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

use a default (audio/mpeg for historical reason) if none. Required since Icecast 2.4.1
Not using AVOption default because this breaks content-type warnings (needs to
detect if no type was set by the user)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

add marcos GET_PERM() LOAD_PIX() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

vorbis_parser.o is built unconditionally since 5e80fb7f, and the
unconditionally built parts of it depend on xiph.o.

This fixes builds with --disable-everything.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'b776113e':
  v4l2: Unify one instance of reading/storing errno

Conflicts:
	libavdevice/v4l2.c

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

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

Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Such strong requirement constraint doesn't allow to use 360p.
Changed to warning when video size is not being multiple of 2.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Fixes out of array read
Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes out of array read
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array read
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28396d17':
  libfdk-aacdec: Support building with the latest version of fdk-aac

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

* github/master:
  tests: Fix test name for pixfmts tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.

The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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