* commit '5074f454':
  wavpack demuxer: export full wavpack blocks.

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

* commit '72dee5f4':
  wavpack: don't set sample format in init.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '35596bd4':
  wavpack: remove a useless parameter from wavpack_decode_block().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd1bec4be':
  wavpack: return an error on 0-sized blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1d177200':
  wavpack: remove a useless check.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0f3a0b24':
  wavpack: add an error message to a failure.
  wavpack: return 0 instead of samples count from decoding functions

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

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

* commit '528daa39':
  wavpack: switch to planar output
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a7ec3a9a':
  wavpack: drop redundant if/else blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7b44c991':
  wavpack: remove the subframes codec cap
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c330eba8':
  lavf: preserve side data when parsing packets.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Untested as theres no code yet using it in the encoder.
Code based on mixed float/int dwt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should fix some fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  smacker: add a clarification notice about audio decoding
  configure: make jack depend on pthreads

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

* commit '538bf767':
  avconv: make -aspect work with streamcopy

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Currently the demuxer shaves the blocks and exports only the
information that is useful to the decoder.

Exporting the blocks just as they are stored is simpler to understand
and will make remuxing wavpack easier.

We don't know whether it will be float until we look at the data.

* commit '564b7e0c':
  matroskadec: silently skip CodecState element.
  smacker: fix off-by-one error in palette expanding code

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

The decoder always returns output if an error does not occur.

Such blocks are not valid.

Number of samples in the first block is checked to be strictly positive
earlier in wavpack_decode_frame() and number of samples in all the other
blocks is checked to be equal to the first one.

The caller never cares about the number of decoded samples, so this only
confuses the reader.

This simplifies the code and makes it faster.

The decoder always consumes full packets.

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

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

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

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

This also fixes lowres use with ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

mant fits in 16bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

mkvmerge apparrently uses it for mpeg1/2 video, but it contains the same
information as CodecPrivate, so it can be ignored.