Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 22:44:29 +0000 (23:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 22:45:05 +0000 (23:45 +0100)
commit618d2262d71e3eca9e01b2d03d0a7d5946737cf0
tree31b071e41a76f12bde8a0236b2ec6ac1ddf2bc07
parent5a4852bc4d6446f1fc158b2e6c41cb0f3c8b98aa
parentf06f6daaf8538eb8ceeb690b761f1256771b6ba6
Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'

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

Conflicts:
libavformat/mxfdec.c

See: f5ed83c3831fcaca0f87cd67ca743946a54023d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mxfdec.c