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/kmvc.c | |
| parent | 7b018e5c8d182b0272477322377b8daafa1c970f (diff) | |
| parent | 57d11e5e28bfe0bc445ad78fc033aafa73068bb4 (diff) | |
| download | ffmpeg-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/kmvc.c')
| -rw-r--r-- | libavcodec/kmvc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index edfafa0401..ffef77138b 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -264,11 +264,10 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame, { KmvcContext *const ctx = avctx->priv_data; uint8_t *out, *src; - int i; + int i, ret; int header; int blocksize; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); - int ret; bytestream2_init(&ctx->g, avpkt->data, avpkt->size); if (ctx->pic.data[0]) @@ -383,7 +382,7 @@ static av_cold int decode_init(AVCodecContext * avctx) if (avctx->width > 320 || avctx->height > 200) { av_log(avctx, AV_LOG_ERROR, "KMVC supports frames <= 320x200\n"); - return AVERROR_INVALIDDATA; + return AVERROR(EINVAL); } c->frm0 = av_mallocz(320 * 200); |