Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Oct 2013 12:55:18 +0000 (14:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Oct 2013 12:55:18 +0000 (14:55 +0200)
* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
  mxf: Remove a typo

Conflicts:
libavformat/mxfdec.c

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

Simple merge