[FFmpeg-cvslog] Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 02:53:30 2014 +0200| [1c59419419d2bdff50627ab15fb4abff4cdb3b29] | committer: Michael Niedermayer

Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'

* commit 'b50173a4dd47b9c3c89845b781fa958ccf860929':
  movenc: fix QT chapter track character encoding

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

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