* commit 'efb7968c':
  arm: Don't unconditionally build dsputil files
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '36a7df8c':
  arm: Only build the FFT init files if FFT is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '186599ff':
  build: cosmetics: Place unconditional before conditional OBJS lines

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

Based on the work of Jeff Moguillansky <Jeff.Moguillansky@am.sony.com>.

See thread:
Subject: [FFmpeg-devel] x11 output device for libavdevice
Date: Wed, 10 Apr 2013 23:10:47 +0000

* commit '9b9b2e9f':
  build: arm: cosmetics: Place all OBJS declarations in alphabetical order
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '70196673':
  vmd: drop incomplete chunks and spurious samples

Conflicts:
	libavcodec/vmdav.c

2 of the changes are replaced by assert0s, as they should
be impossible.
The actual bug is likely caused by a invalid block_align
which is checked for and thus impossible in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '676da248':
  vmd: refactor the inner decode loop

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

* commit 'c8f3cb91':
  vmd: return meaningful errors

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

* commit '91a6944e':
  vmd: use the PALETTE_COUNT constant uniformly

Conflicts:
	libavcodec/vmdav.c

No change as the changed line does not exist in ffmpegs vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

This fixes build errors in cases where FFT is disabled.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

Makes it easier to use static allocation for the result buffer.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

This is necessary since the switch to floating point
input means there is no longer sufficient input data
validation.
There is a good chance that other encoders are affected
by similar issues.
This problem can be triggered by trying to encode
extremely large values and probably also with Inf and
possibly also NaNs.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Odd chunk size makes no sense for stereo and incomplete chunks are
not supported.

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

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>

These are needed for lowres 3

This may fix Ticket2538
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>

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

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

APEv2 specifications forbids non-ascii keys.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixes #1995.
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>

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

Simplify a little, assume empty frames are acceptable and
do not pointlessly reinit the bytestream2 contexts using
possibly wrong size values.

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

CC: libav-stable@libav.org

While at it drop useless parentheses.

* qatar/master:
  doc: Mention the target_samples and ld variables for fate configs
  fate.sh: Allow specifying --as via a specific variable

Conflicts:
	doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9f30fb5a':
  configure: Don't pass -mthumb or -march= to MSVC
  mpeg12: skip frames consistently

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