Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:17:58 +0000 (00:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:18:03 +0000 (00:18 +0200)
commit8b1e920676f6eeeb01422660768f5f92b3811bc6
treee12162f3253d3a154facd7334c7a02768b0ca29a
parent4a4d0258eef26a8c7e93f68024b639290e1c8cb2
parent259fe7280d0b63dc7a8ff017d44f26d3a84cfde8
Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'

* commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8':
  mxf: Extract origin information from material and source track

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