* 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>

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>

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>

* commit '2d2d6a48':
  lavf: add a raw WavPack muxer.
  apetag: add support for writing APE tags
  matroskaenc: support muxing WavPack

Conflicts:
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/apetag.h
	libavformat/version.h
	libavformat/wvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '794ca87d':
  wvdec: split block header parsing into a separate file

Conflicts:
	libavformat/Makefile
	libavformat/wvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0a1a9445':
  lavf: rename wv.c to wvdec.c

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

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

This simplifies specifying a value containing spaces for this
parameter.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '89806691':
  wavpack: check that all the channels were coded.
  wavpack: check that there aren't too many blocks per packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7d039e70':
  wavpack: extract channel information from the bitstream
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '78f75b6f':
  wavpack: extract sample rate from the bitstream
  configure: support gcc-4.8 instrumentation

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

* commit 'ba13606c':
  fate: Add a --target-samples path parameter

Conflicts:
	configure
	tests/fate/audio.mak
	tests/fate/cover-art.mak
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/filter-video.mak
	tests/fate/h264.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/pcm.mak
	tests/fate/prores.mak
	tests/fate/qt.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/vpx.mak
	tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4a27a52a':
  fate: Don't use files from SRC_PATH in the actual tests
  indeo4: reuse context block VLC for band instead of defaulting

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

* commit '6647aa04':
  indeo4: add missing Haar and slanted transforms
  dxtory v2 support

Conflicts:
	libavcodec/indeo4.c
	libavcodec/ivi_dsp.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '72821499':
  vc1dec: Remove interlaced warning
  vc1dec: Fix mixed field/frame intensity compensation
  vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4
  vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed
  vc1dec: Fix doxy for vc1_mc_4mv_chroma4()
  vc1dec: Drop old use_ic code from vc1_b_mc
  vc1: Use shuffled use_ic instead of equally shuffled mv_mode
  vc1dec: Implement intensity compensation for vc1_interp_mc()

Conflicts:
	Changelog
	libavcodec/vc1dec.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>