Commit 61a8eaf7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7a5a5572'

* commit '7a5a5572':
  qpeg: Add checks for running out of rows in qpeg_decode_inter

Conflicts:
	libavcodec/qpeg.c

See: 4299dfa5Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3f4cf77a 7a5a5572
...@@ -193,7 +193,7 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, ...@@ -193,7 +193,7 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst,
filled = 0; filled = 0;
dst -= stride; dst -= stride;
height--; height--;
if(height < 0) if (height < 0)
break; break;
} }
} }
...@@ -209,7 +209,7 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, ...@@ -209,7 +209,7 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst,
filled = 0; filled = 0;
dst -= stride; dst -= stride;
height--; height--;
if(height < 0) if (height < 0)
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment