[FFmpeg-cvslog] Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 22:39:18 2014 +0100| [3ce858141309c09294177e63d9a36cd0924dc200] | committer: Michael Niedermayer

Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'

* commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416':
  mxf: Set audio packets pts

Conflicts:
	libavformat/mxfdec.c

See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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