diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 15:35:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 15:40:47 +0200 |
| commit | 251f283b9d1bbec2fa5031c733d95d319283d6c5 (patch) | |
| tree | 827c75557e11a07cd06e10da21a9281fd7b7f990 /libavcodec/svq1dec.c | |
| parent | f60ba6c52418a42c5a59a6b9d1e8c13b41c961e3 (diff) | |
| parent | b1bb8fb860b47e90dd67f0c5740698128fc82dcc (diff) | |
| download | android_external_ffmpeg-251f283b9d1bbec2fa5031c733d95d319283d6c5.tar.gz android_external_ffmpeg-251f283b9d1bbec2fa5031c733d95d319283d6c5.tar.bz2 android_external_ffmpeg-251f283b9d1bbec2fa5031c733d95d319283d6c5.zip | |
Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'
* commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc':
svq1dec: check that the reference frame has the same dimensions as the current one
Conflicts:
libavcodec/svq1dec.c
See: 3b57bb478ff4455773378355e285877d757e151e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1dec.c')
| -rw-r--r-- | libavcodec/svq1dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index c71b361c0c..f9fbce4c2a 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -689,7 +689,8 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data, } else { /* delta frame */ uint8_t *previous = s->prev->data[i]; - if (!previous || s->prev->width != cur->width || s->prev->height != cur->height) { + if (!previous || + s->prev->width != s->width || s->prev->height != s->height) { av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n"); result = AVERROR_INVALIDDATA; goto err; |