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

Fixes >8 channels
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes handling of >8 channels
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes handling of cases with unknown layouts but known channel counts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The avresample maintainers decided not to support old versions of yasm.
Supporting old yasm in FFmpeg was no big effort in the last months,
so keep it for the time being.

Fixes the cause of a null pointer dereference on oom
described in ticket #2724.

Ask for a sample instead.

Reviewed-by: Derek Buitenhuis

QNX does not define SA_RESAMPLE (because it is not implemented).
Fixes ticket #2780.

Reviewed-by: Nicolas George

It is not completely obvious where delogo's parameter show=1 draws its
rectangle. Document it so that the user can more easily tune the
parameters.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Coverity complains about a possible sign extension issue in
apply_delogo(). While it is extremely unlikely to happen, it is easy
to fix so let's just do that. Using unsigned variables even makes the
binary code smaller.

Fixes Coverity CID 1046439.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes decoding some files
Fixes Ticket2126
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

this allows named idct options to be used
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes decoding of file generated with:
ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  jpeg2000: Initialize only once mqc arrays
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Improves decoding speed.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Increases encoding and decoding speed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is a hotfix to fix -t / -ss
a different solution might be choosen later, i just dont want to leave
this broken
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Workarounds for rounding differences between platforms should not be
needed any more.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixes remainder of Ticket893

Std deviation from the intended image is 0.11, max sample error +-1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  vf_interlace: better handling of odd video size

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

* commit '52ea2986':
  fate: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3802833b':
  dca: Respect the current limits in the downmixing capabilities

Conflicts:
	libavcodec/dcadec.c

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

* commit 'f261e508':
  dca: Error out on missing DSYNC
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c82da343':
  pcm: always use codec->id instead of codec_id

This is not merged as we consistently use codec_id, while libav against what
the comit message might hint at mixes both in the decoder.
Its fine to use either but it should be consistent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0d973c4':
  vdpau: use the correct namespace for the union

Conflicts:
	libavcodec/vdpau.h

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

* commit 'e9d394f3':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
	libavcodec/mlpdec.c

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

* commit '2b379a92':
  mlpdsp: x86: Respect cpuflags

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

* commit '3abde1a3':
  pcx: Do not overread source buffer in pcx_rle_decode

Conflicts:
	libavcodec/pcx.c

See: 8cd1c0fe
Bytestream based system is left in place and not switched to buf+end, such switch would be
a step backward
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '170fb593':
  pcx: K&R formatting cosmetics

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

* commit 'ef5b70af':
  configure: Check for support for labels in the inline assembly

The timer code is not placed under ifdef as ours does not use labels
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

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

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