[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 11:58:46 2013 +0200| [3ed3aaab32f58dab2a841a95e032e871d928fb7f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ed3aaab32f58dab2a841a95e032e871d928fb7f
---