* commit '93b12812':
  vc1dec: Shuffle field MVs after decoding, not before
Merged-by: Michael Niedermayer <michaelni@gmx.at>

the float conditions are largely changed to check the DWT
instead of the bitexact flag, which previously was wrong
(DWT53 is always int)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The ist->pts value at this point does not necessarily match the actual packet
pts, which is what should be used to decide whether to discard the packet.
Without this change, some video packets that have pts on or after the start
time are getting discarded when they should not be.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is more clear and less prone to mistakes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The quantization code needs more work, not so much work
merging but more work investigating what is correct.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Ive no test samples for which this makes a difference but it
matches the 16bit implementation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This simplifies the code since copying MVs to the reference is not needed
anymore (and maybe something about fixing artifacts).

Also remove the unused mv_f_last.

Fixes a small number of artifacts in black_screen_VC-1.mkv
and several more artifacts in other videos.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

For useage in other places besides lavc. Needed after commit
90f9a583Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  smacker: assign video frame PTS
  matroskadec: export full wavpack blocks.

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

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

This allows us to get rid of demuxer-specific hacks in the decoder and
will allow streamcopy from matroska once we have a wavpack muxer.

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.