Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 19:54:12 +0000 (20:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 19:54:35 +0000 (20:54 +0100)
* commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5':
  mxf: Verbose debug logging

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mxf.h

Simple merge