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

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

* qatar/master:
  libvpxenc: Allow enabling constrained quality (CQ) mode

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

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

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

More consistent with the rest of the build system, and more compact.

Improve feedback.

The CQ mode was introduced in libvpx 0.9.6.
Signed-off-by: Martin Storsjö <martin@martin.st>

A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This remove the owner, group and permission preservation on fatesample checkouts
These caused problems for durandal_1707
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Previous version had significant artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  libopencore-amr: Check the return value of amr_decode_fix_avctx
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Final result is same and this allows support of multiple values per codec.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

This allows getting rid of redundant checks later in the codec
specific init functions.

Move the check to before actually initializing the decoder lib,
to simplify error handling.

This fixes a case of returning a value from a void function, present since
d40dab90.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also slightly clarify logic, and should fix coverity issue CID 717771.

Found by Coverity, should fix CID 733741.

Also fix Coverity issue CID 733743: Dereference after null check

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

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

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

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

Wavpack format documentation mentions that 131072 is
max number of samples.

This fixes huge memory allocations in sample from ticket #1889.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

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

* qatar/master:
  fate: atrac: Place atrac1 and atrac3 tests in different groups
  fate: aac: cosmetics: Group AAC LATM tests together
  x86: avresample: Add missing colons to assembly labels

Conflicts:
	tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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