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)
* commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6':
  mxf: Parse random index pack

Conflicts:
libavformat/mxfdec.c

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

Simple merge