Merge commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:16:37 +0000 (13:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:18:41 +0000 (13:18 +0100)
* commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1':
  cook: Make sure there is enough extradata

See: c9e455432988acd414990ba92f782b8e3c4b6aea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/cook.c

Simple merge