wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '57d11e5e28'

Browse source 
* commit '57d11e5e28':
  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>
This commit is contained in:
Michael Niedermayer 2013-01-07 00:38:25 +01:00
commit 07f22d0b49
7 changed files with 54 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/pnmdec.c
View file

@ -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;