[FFmpeg-cvslog] Merge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:01:50 2015 +0100| [6f14434218878c2f31c03e1a43b3506f398d6d7c] | committer: Michael Niedermayer

Merge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4

* commit '484e015dc8b9983297e9269b406c65084daf4528':
  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=6f14434218878c2f31c03e1a43b3506f398d6d7c
---