Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
	libavcodec/8bps.c

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

diff --cc libavcodec/8bps.c
index 2c03e8b,ad1266f..c46c8c1
--- 1/libavcodec/8bps.c
--- 2/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@@ -96,7 -105,7 +96,7 @@@ static int decode_frame(AVCodecContext 
                  if ((count = *dp++) <= 127) {
                      count++;
                      dlen -= count + 1;
-                     if (pixptr + count * planes > pixptr_end)
 -                    if (pixptr_end - pixptr < count * px_inc)
++                    if (pixptr_end - pixptr < count * planes)
                          break;
                      if (ep - dp < count)
                          return AVERROR_INVALIDDATA;
@@@ -106,7 -115,7 +106,7 @@@
                      }
                  } else {
                      count = 257 - count;
-                     if (pixptr + count * planes > pixptr_end)
 -                    if (pixptr_end - pixptr < count * px_inc)
++                    if (pixptr_end - pixptr < count * planes)
                          break;
                      while (count--) {
                          *pixptr = *dp;