Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:58:46 +0000 (22:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:59:35 +0000 (22:59 +0100)
* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
libavformat/mxfdec.c

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

Simple merge