Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 00:14:44 +0000 (02:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 00:18:32 +0000 (02:18 +0200)
commit069e462bebdea61d57e73099e218e38a78862a5a
treeaa89edacaecd535f8b3d7cf34ba6abe9f5ea6a3f
parenta692ff93ef5ba90e07c3fdecf05359bdca9b9066
parentad8f736b7404503d8f5164f4879175a2258dd64b
Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'

* commit 'ad8f736b7404503d8f5164f4879175a2258dd64b':
  mxf: Remove typo

also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon

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