[FFmpeg-cvslog] Merge commit 'c9d982aa11a6267611c3770792f0e04b48438348'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 29 00:11:46 2014 +0200| [4a4d0258eef26a8c7e93f68024b639290e1c8cb2] | committer: Michael Niedermayer

Merge commit 'c9d982aa11a6267611c3770792f0e04b48438348'

* commit 'c9d982aa11a6267611c3770792f0e04b48438348':
  mxf: Detect Vanc/Vbi SMPTE-436M mxf track

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

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