Michael Niedermayer 3ed3aaab32 Merge remote-tracking branch 'qatar/master' ...

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

Conflicts:
	libavcodec/wavpack.c

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

2013-05-28 11:58:46 +02:00

13 KiB

Raw Blame History

View Raw