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

* commit '34e6af9e':
  indeo3: fix data size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '66531d63':
  indeo3: switch parsing the header to bytestream2

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

* commit '01d376f5':
  rv10: check that extradata is large enough
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bac8d38c':
  rv10: return meaningful error codes.

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

* commit '69f6f03c':
  rv10: cosmetics, reformat
  qdm2: check that the FFT size is a power of 2

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

* commit 'ecff5acb':
  svq1dec: clip motion vectors to the frame size.

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

* commit 'b1bb8fb8':
  svq1dec: check that the reference frame has the same dimensions as the current one

Conflicts:
	libavcodec/svq1dec.c

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

* commit 'c0771a1a':
  af_channelmap: cosmetics, use an extra local variable to shorten the code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aafed117':
  af_channelmap: sanity check input channel indices in all cases.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The data offsets are relative to the bistream header, which is 16 bytes
after the start of the data.
Fixes invalid reads with corrupted files.

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

Also add an additional sanity check to the alt_quant table.
Fixes invalid reads with corrupted files.

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

AVABufferSinkParams are ignored by avfilter_graph_create_filter,
therefore the example is misleading.  Use av_opt_set_int_list to
configure abuffersink directly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes accessing freed memory
Signe-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Also improve some error messages.

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

Fixes invalid reads for corrupted files.

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

They can be different if the last keyframe failed to decode correctly.
Fixes possible invalid reads in such a case.

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

Fixes invalid reads from non-existing channels.

CC:libav-stable@libav.org

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

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

Fixes compilation of pngenc.c and flvdec.c with PGC 13.4-0.

Fixes compilation of srtenc.o with PGC 13.4-0.

adds are simpler instructions and should be faster or equally fast
on all cpus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  cmdutils: Fix build with lavfi disabled
  flvenc: do not mux more than one stream per type
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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