diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 00:38:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 00:41:06 +0100 |
| commit | 07f22d0b49332d9616ce5ff94679da5a01c19b0d (patch) | |
| tree | 00e7f5f81436ddf1e54339661383e8fc6105cfca /libavcodec/kgv1dec.c | |
| parent | 7b018e5c8d182b0272477322377b8daafa1c970f (diff) | |
| parent | 57d11e5e28bfe0bc445ad78fc033aafa73068bb4 (diff) | |
| download | ffmpeg-streaming-07f22d0b49332d9616ce5ff94679da5a01c19b0d.zip ffmpeg-streaming-07f22d0b49332d9616ce5ff94679da5a01c19b0d.tar.gz | |
Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4'
* commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4':
fraps: return meaningful error codes.
kgv1dec: return meaningful error codes.
kmvc: return meaningful error codes.
wnv1: return meaningful error codes.
dpx: return meaningful error codes.
truemotion1: return meaningful error codes
pnm: return meaningful error codes.
Conflicts:
libavcodec/dpx.c
libavcodec/fraps.c
libavcodec/kmvc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/kgv1dec.c')
| -rw-r--r-- | libavcodec/kgv1dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 0199636..008843c 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -55,14 +55,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int w, h, i, res; if (avpkt->size < 2) - return -1; + return AVERROR_INVALIDDATA; w = (buf[0] + 1) * 8; h = (buf[1] + 1) * 8; buf += 2; - if (av_image_check_size(w, h, 0, avctx)) - return -1; + if ((res = av_image_check_size(w, h, 0, avctx)) < 0) + return res; if (w != avctx->width || h != avctx->height) { if (c->prev.data[0]) |
