[FFmpeg-cvslog] Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 29 00:17:58 2014 +0200| [8b1e920676f6eeeb01422660768f5f92b3811bc6] | committer: Michael Niedermayer

Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'

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

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

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