* commit '60b05513':
  png_parser: fix size of chunk_lenght

Conflicts:
	libavcodec/png_parser.c

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

* commit '443502ae':
  dvbsubdec: move shared codepath

Conflicts:
	libavcodec/dvbsubdec.c

The merged code is ignored and the factorization redone with
the code that is in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Untested, i failed to find a sample which triggers this case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '23833236':
  dvbsubdec: improve error checking

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

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

* commit '1bdd21d9':
  dvbsubdec: add missing break

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

* commit 'a6defd1f':
  hevc_cabac: decrease CABAC_MAX_BIN

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

* commit '9e9be5a2':
  hevc_mvs: prevent unitialized use
Merged-by: Michael Niedermayer <michaelni@gmx.at>

In general this commit prepares opt tests to be added to fate.

The commit set some non-zero defaults for test options.
It allows to check if defaults are really set.

Added printing of default values.

Added more cases for testing av_set_options_string
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

set_string_binary crashes when called with val==NULL
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

* commit '0e1ebfeb':
  4xm: drop unnecessary check

Conflicts:
	libavcodec/4xm.c

The check is currently redundant, it is for saftey left in place though
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7c61e4b1':
  hpeldsp: Increase put_no_rnd_pixels_tab[][] size

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

* 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>

Fixes the comparison against constant value 0x7fffffff.

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

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

Use av_mallocz_array instead of iterating and check the returned memory.
Check returned memory and cleanly exit in case of error during the loop.
Avoid a null pointer dereference for invalid data.

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

Fix a memory leak too.

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

Prevents shifts with undefined behavior, as no syntax element has a valid
value greater than 1 << 31.

Bug-Id: CID 1206635

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

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

data_size is always >= 0 in this case.

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

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

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>