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

* qatar/master:
  h264: avoid pointless copying of ref lists
  lavr: always reset mix function names and pointers in mix_function_init()
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()

Conflicts:
	tests/ref/fate/filter-delogo
	tests/ref/fate/rv30
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '80ac87c1':
  lavc: support ZenoXVID custom tag
  libcdio: support recent cdio-paranoia
  float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
  theora: Skip zero-sized headers

Conflicts:
	configure
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

This commit changes the ".so" argument placement in check_ld sub-program.

ref_list is constructed from other fields per slice when needed, so do
not copy it for both frame and slice threading.
default_ref_list is constructed per frame and still needs to be copied
to per-slice contexts for slice threading, but a copy is not needed for
frame threading.

Fixes memory corruption

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

CC: libav-stable@libav.org

This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.

CC:libav-stable@libav.org

Fix assertion failure

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

Fixes assertion failure

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

The mask `x && (1 << y)' is incorrect and always yields true.

The correct form should be `x & (1 << y)'.

CC: libav-stable@libav.org
Signed-off-by: NXi Wang <xi.wang@gmail.com>
Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>

Looks like this kind of samples are produced by certain Russian
equipment.

Upstream decided to split the paranoia interface and move the headers
accordingly.

Fixes ticket #1953.

av_codec_get_tag() may return 0 both in case a codec_tag was
found and if no codec_tag was found.
The new function does not have this ambiguity.

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

This fixes builds on 64bit MSVC.
Signed-off-by: NMartin Storsjö <martin@martin.st>

This fixes a regression since d9cf5f51 with theora over RTP
(possibly with other variants of theora as well).

In theora over RTP, the second of the 3 headers turns out to be
0 bytes long, which prior to d9cf5f51 worked just fine. After
d9cf5f51, reading from the bitstream reader fails (since the reader
wasn't initialized but returned an error if initialized with 0 bits).

CC: libav-stable@libav.org
Signed-off-by: NMartin Storsjö <martin@martin.st>

Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file.
Reported-by: Mashiat Sarker Shakkhar

Reviewed-by: Paul B Mahol

This code causes the chunking to tend toward more optimal
alignment between streams.
The first chunks can still be less optimal aligned

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

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

* qatar/master:
  idcin: fix memleaks in idcin_read_packet()

Conflicts:
	libavformat/idcin.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Write the packet unaltered if found.

Fixes ticket #1917
Signed-off-by: NJames Almer <jamrial@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

It was always detected successfully.

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

Fixes inconsistencies in context

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

Fixes out of array accesses

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

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

The code did not account properly for packets that where added to
the end of the packet list. Also flags for such packets where not
set correctly leading to incorrect chunked interleaving.

Reported-by: bcoudurier
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Reviewed-by: N"Babic, Nedeljko" <nbabic@mips.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes fate-id-cin-video failures when running FATE with valgrind.

The exact packing of Opus inside Matroska is not finalized.
Use A_OPUS/EXPERIMENTAL as codec name, like mkvtoolnix.
The A_OPUS name stays to let ffmpeg open files it has produced
until now, but newly produced file use the EXPERIMENTAL version.
Once the spec is stabilized it will be possible to consider
options to ensure compatibility with these files.

icc should not complain when 2 enum values are combined (for example when
used as flags)
Adding casts to suppress these would not help code quality
Reviewed-by: NCarl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

a small value was rounded to 0 and then treated special as if
chunked_duration was 0. This led to a inconsistency that further led
to wrong interleaving
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lavc: Move vector_fmul_window to AVFloatDSPContext
  rtpdec_mpeg4: Check the remaining amount of data before reading

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

Fix a warning and random failures.

* commit '977d4a3b':
  rtpdec_mpeg4: Check the return value from malloc
  srtp: Mark a few variables as uninitialized
Merged-by: NMichael Niedermayer <michaelni@gmx.at>