[FFmpeg-cvslog] Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 23:44:29 2014 +0100| [618d2262d71e3eca9e01b2d03d0a7d5946737cf0] | committer: Michael Niedermayer

Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'

* commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6':
  mxf: Parse random index pack

Conflicts:
	libavformat/mxfdec.c

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

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