* commit 'b1b1a737':
  display: fix order of operands

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

* commit 'bdcb5794':
  nellymoserenc: fix array index

Not merged, the original code was correct.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa7c429c':
  nellymoserenc: fix array element ordering

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

* commit '8dd0a2c5':
  libopusenc: prevent an out-of-bounds read by returning early
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b09cf8af':
  libopusenc: check return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '29234f56':
  vp7: fix checking vp7_feature_value_size()

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

* commit '68a35473':
  4xm: more thorought check for negative index and negative shift

Conflicts:
	libavcodec/4xm.c

Mostly not merged, the added checks, check for impossible conditions
for paranoias sake they are replaced by asserts but thats probably overkill
the vlc table does not contain out of range values or holes,
nor does it permit the log2 values to become negative. Whenever a
log2 value reaches 0 the selected table no longer contains an entry to trigger
the case that would decrease it further

Adding such impossible checks would confuse the reader
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

CC: libav-stable@libav.org
Bug-Id: CID 1238828 / CID 1238832

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

Fixes assertion failures and valgrind warnings in trellis encoder.

CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257

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

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

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

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

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

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

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

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

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

Signed-off-by: James Almer <jamrial@gmail.com>

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

libswscale/ppc/swscale_altivec.c : fix hScale_altivec_real() yuv2planeX_16_altivec() yuv2planeX_8() for little endian

add marcos GET_LS() GET_VF() LOAD_FILTER() LOAD_L1() GET_VF4() FIRST_LOAD() UPDATE_PTR() LOAD_SRCV() LOAD_SRCV8() GET_VFD() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Allows shared compilation on x32 with --disable-asm.

Only consider SEI when no PPS has been found yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cus/stable:
  ffplay: signal the frame queue before closing audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>

According to the DASH spec, Representation IDs should be unique
across all adaptation sets. Fixing that and updating the fate
reference file to reflect this change.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c9c7d59b':
  tiff: Use av_mallocz_array

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

* commit 'c6074a30':
  opt: Fix the documentation mentioning av_set_string3
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1b667269':
  h264_parser: don't stop on SPS_EXT in split
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4cb9f1a7':
  h264_cabac: fix one fill_rectangle() indentation level

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

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

Fixed regression caused by 631ac655 when ffplay
does not quit if the audio thread is blocked.
Signed-off-by: Marton Balint <cus@passwd.hu>

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>