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>

diff --cc libavcodec/cook.c
index 775cff5b9179b6296c36a4aceb5bf445316cd189,74378521b3d362c7e9ec0087ba3ed8e2a311c916..31b0f1f8b081e729557254db00ca05ba62e38490
--- 1/libavcodec/cook.c
--- 2/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@@ -651,7 -652,7 +652,7 @@@ static int mono_decode(COOKContext *q, 
      int category_index[128];
      int quant_index_table[102];
      int category[128];
-     int ret, i;
 -    int res;
++    int res, i;
  
      memset(&category,       0, sizeof(category));
      memset(&category_index, 0, sizeof(category_index));
@@@ -840,10 -830,10 +841,10 @@@ static int joint_decode(COOKContext *q
      /* Make sure the buffers are zeroed out. */
      memset(mlt_buffer1, 0, 1024 * sizeof(*mlt_buffer1));
      memset(mlt_buffer2, 0, 1024 * sizeof(*mlt_buffer2));
-     if ((ret = decouple_info(q, p, decouple_tab)) < 0)
-         return ret;
-     if ((ret = mono_decode(q, p, decode_buffer)) < 0)
-         return ret;
 -    decouple_info(q, p, decouple_tab);
++    if ((res = decouple_info(q, p, decouple_tab)) < 0)
++        return res;
+     if ((res = mono_decode(q, p, decode_buffer)) < 0)
+         return res;
 -
      /* The two channels are stored interleaved in decode_buffer. */
      for (i = 0; i < p->js_subband_start; i++) {
          for (j = 0; j < SUBBAND_SIZE; j++) {

diff --cc libavcodec/dsicinav.c
Simple merge

diff --cc libavcodec/mpcdata.h
Simple merge