* commit 'cdb1665f':
  aarch64: Make transpose_4x4H do a regular transpose
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This merge is a no-op.

* commit 'edf54887':
  rtpdec_jpeg: fix low contrast image on low quality setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '15932389':
  intrax8: Add a local BlockDSPContext and initialize it
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '1eaae7ab':
  intrax8: Reference the current AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '8072345e':
  intrax8: Keep a reference to the GetBitContext reader
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '65f14128':
  intrax8: Use a constant buffer instead of a ScratchpadContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'eaeba6f2':
  intrax8: Pass the output frame to the decoding function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '57739332':
  intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '68127e1b':
  intrax8: Keep a reference to the context idctdsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '65127450':
  intrax8: Make x8_init_block_index not use mpegvideo fields
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '922b7e6d':
  intrax8: Use local destination buffers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'a7da517f':
  h264data: Move all data tables from a header to a .c file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f4d581cd':
  lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes segfault
Fixes Ticket5347
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '02cd8bb9':
  h264: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This fixes demuxing of 01c56b0dc1.ts
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Assert that the number of consumed bytes in avcodec_decode_audio4() is <= the input size
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reported by forum user turas35.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Adds per slave option 'onfail' to the tee muxer allowing an output to
fail, so other slave outputs can continue.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

In open_slave failure can happen before bsfs array is initialized,
close_slave must check that bsfs is not NULL before accessing
tee_slave->bsfs[i] element.

Slave muxer expects write_trailer to be called if it's
write_header suceeded (so resources allocated in write_header
are freed). Therefore if failure happens after successfull
write_header call, we must ensure that write_trailer of
that particular slave is called.

Some cleanups are made by Marton Balint.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

* commit '704a3976':
  rtmpdh: add an stdio.h include
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. Ivan Uskov is going to port it for us.

* commit 'e3dfef8e':
  qsvdec_h2645: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Lou Logan <lou@lrcd.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* commit 'a638e918':
  vf_fade: make sure the slice end is always in the frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '3b08d9d9':
  testprogs: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '43992985':
  testprogs: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '3dfbf32b':
  build: Drop redundant removal of compiled object files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b298b36f':
  fate: Only run SRTP test if SRTP code is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '3ee2ec5e':
  unix: Use rw_timeout for setting the connect timeout
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '136c3438':
  tcp: Use rw_timeout for setting the connect/listen timeouts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'fab8156b':
  avio: Copy URLContext generic options into child URLContexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This function bo longer takes an AVCodecContext.

Fixes ticket #5430.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

From Libav commit 8bc4accc, with
additional code for decoding subtitles (not present in Libav).
Signed-off-by: Anton Khirnov <anton@khirnov.net>