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)
commit1c59419419d2bdff50627ab15fb4abff4cdb3b29
tree9e762b37123fa2754337d4bac72ec6bf7d1e2c3f
parent403367d5a95c26b3c5d72ae7aca10bae0f58a827
parentb50173a4dd47b9c3c89845b781fa958ccf860929
Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'

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

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