[FFmpeg-cvslog] Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 27 12:26:19 2013 +0200| [0bd15938ec5e0d5d77e217e7e3ce73c7c188ee5c] | committer: Michael Niedermayer

Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'

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

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

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