* cus/stable:
  ffplay: add support for changing the channel by the C key
  ffplay: cycle through the streams of the current program, and not every stream
  ffplay: add null packet after attached pics packet
  ffplay: factor out putting null packet into the queue
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes null pointer dereference
Fixes Ticket2843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Line comes from ecab1c77
and was not merged previously

Thanks-to: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Marton Balint <cus@passwd.hu>

When changing the audio, video or subtitle stream, from now on, ffplay will
cycle through the streams of the current program.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes ticket #2904.
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

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

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

* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
	libavcodec/indeo4.c

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

* commit '0cb83c56':
  indeo4: Check the block size if reusing the band configuration

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

* commit 'fd2384f0':
  oggparsevorbis: fail on memory allocation error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c18375ec':
  oggvorbisdec: add support for embedded cover art

Conflicts:
	libavformat/oggparsevorbis.c

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

* commit '601d6228':
  flac: move picture parsing code in a separate file

Conflicts:
	libavformat/Makefile
	libavformat/flacdec.c

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

* commit 'ecab1c77':
  oggdec: add support for Opus in Ogg demuxing

Conflicts:
	Changelog
	libavformat/oggparseopus.c
	libavformat/version.h

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

* commit 'ed9245db':
  oggparsevorbis: check allocations

Conflicts:
	libavformat/oggparsevorbis.c

See: 033f1644
See: 84aea80fMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9c15ef35':
  oggparsevorbis: support official chapter extension

Conflicts:
	libavformat/oggparsevorbis.c

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

* commit '16ea20c8':
  lavc doxy: extend/clarify avcodec_decode_audio4() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '66d3f5fd':
  lavc doxy: remove false statements about alignment requirements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '364af376':
  FATE: add lavr resampling tests

The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9ab5f710':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'df6737a5':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Invalidate it if not supported.

Sample-Id: 00000262-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Sample-Id: 00000287-google

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Also set color space.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Elaborate on flushing the decoder.

The packet data does not need to be aligned.

CC:libav-stable@libav.org

* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index
Merged-by: Michael Niedermayer <michaelni@gmx.at>