[FFmpeg-cvslog] Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  4 02:14:44 2014 +0200| [069e462bebdea61d57e73099e218e38a78862a5a] | committer: Michael Niedermayer

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 at gmx.at>

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