Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:58:46 +0000 (11:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:58:46 +0000 (11:58 +0200)
commit3ed3aaab32f58dab2a841a95e032e871d928fb7f
tree86cdfb67870860e42d568d965ca1cfff242cd586
parent8012f93ed8afbf0b45fa378085cd4b000e30057f
parent851bc1d6be0c7485609e0208d188f3edbc4ade13
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>
libavcodec/wavpack.c
libavformat/matroskadec.c
libavformat/smacker.c