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

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

Fixes Ticket #2517.

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

Also add a fate test that tests 9/7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Smacker audio uses overflows instead of clipping.

This reverts commit 375ca0ac.

This seems more natural and matches jpeg2000
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: Michael Niedermayer <michaelni@gmx.at>

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

cblk is now in the same place as in jpeg2000, which will simplify
merging the 2 decoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>