Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 00:53:30 +0000 (02:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 00:54:23 +0000 (02:54 +0200)
* commit 'b50173a4dd47b9c3c89845b781fa958ccf860929':
  movenc: fix QT chapter track character encoding

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

Simple merge