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/pnmdec.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/pnmdec.c')
| -rw-r--r-- | libavcodec/pnmdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index fd17fe3499..1c22f74052 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -41,8 +41,8 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, s->bytestream = (uint8_t *)buf; s->bytestream_end = (uint8_t *)buf + buf_size; - if (ff_pnm_decode_header(avctx, s) < 0) - return AVERROR_INVALIDDATA; + if ((ret = ff_pnm_decode_header(avctx, s)) < 0) + return ret; if (p->data[0]) avctx->release_buffer(avctx, p); @@ -57,7 +57,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, switch (avctx->pix_fmt) { default: - return AVERROR_INVALIDDATA; + return AVERROR(EINVAL); case AV_PIX_FMT_RGBA64BE: n = avctx->width * 8; components=4; |