[FFmpeg-cvslog] Merge commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 13:16:37 2014 +0100| [1db2d39dfddacb50546c9cdc1071f42146b23fa6] | committer: Michael Niedermayer

Merge commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1'

* commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1':
  cook: Make sure there is enough extradata

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

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