Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Mar 2012 03:35:06 +0000 (04:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Mar 2012 03:35:06 +0000 (04:35 +0100)
commit1c27359867cfd6b3a8f0d3d03144f183ccda694b
treecd72985372a9e203b051b382c0c35e5d569e3b2f
parent00969376cefda9c733217bff139f911c24b16deb
parentc95fefa0420be9cc0f09a95041acf11114aaacd0
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsicinvideo: validate buffer offset before copying pixels.
  cook: error out on quant_index values outside [-63, 63] range.
  mpc: pad mpc_CC/SCF[] tables to allow for negative indices.

Conflicts:
libavcodec/cook.c
libavcodec/dsicinav.c
libavcodec/mpc.c
libavcodec/mpc7.c
libavcodec/mpcdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cook.c
libavcodec/dsicinav.c
libavcodec/mpcdata.h