diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:20:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:20:06 +0200 |
| commit | 61a8eaf7119db509cbfc0b8c123f5c6baad78a32 (patch) | |
| tree | 4cf52eba4c670184895be48282fd4401c58a5498 | |
| parent | 3f4cf77abde20b83832b8860882f4a4c9c0e8572 (diff) | |
| parent | 7a5a55722749a3ab77941914707277b147322cbe (diff) | |
| download | ffmpeg-61a8eaf7119db509cbfc0b8c123f5c6baad78a32.tar.gz | |
Merge commit '7a5a55722749a3ab77941914707277b147322cbe'
* commit '7a5a55722749a3ab77941914707277b147322cbe':
qpeg: Add checks for running out of rows in qpeg_decode_inter
Conflicts:
libavcodec/qpeg.c
See: 4299dfa5ded84111231a456ad102f65f6f62649e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/qpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 6015b7f4b0..f936338e4d 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -193,7 +193,7 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, filled = 0; dst -= stride; height--; - if(height < 0) + if (height < 0) break; } } @@ -209,7 +209,7 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, filled = 0; dst -= stride; height--; - if(height < 0) + if (height < 0) break; } } |