Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:52:12 +0000 (12:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:52:17 +0000 (12:52 +0200)
commit231201382ea0697b9e29fabcd7996db719ea8b9a
treec85ee5f3bc493d1fb3ad89c7de4b179d52f56378
parentda2038221bc68e28edaaeddecff8d48cce2c9e52
parent0fb3e1c6ce50ae4366c7e5571f2a8278d7fd6297
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Check for errors from mov_create_chapter_track

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