Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:26:19 +0000 (12:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:26:27 +0000 (12:26 +0200)
commit0bd15938ec5e0d5d77e217e7e3ce73c7c188ee5c
tree213d70fefe37860da46a892dd0fbd86ee63d8b4f
parent535d9a938672af0155bae430e23a9ada35f40ff4
parent4d122b01e4ce539269ee2df193b061772c7374f6
Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'

* commit '4d122b01e4ce539269ee2df193b061772c7374f6':
  movenc: Check for allocation failures in mov_create_chapter_track

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