RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6' 

* commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6':
  pcxenc: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-05 02:16:50 +01:00
parent 4574f11e4d f3b74d944b
commit dcf7924f4d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/pcxenc.c
View File

@ -69,7 +69,7 @@ static int pcx_rle_encode( uint8_t *dst, int dst_size,
// check worst-case upper bound on dst_size // check worst-case upper bound on dst_size
if (dst_size < 2LL * src_plane_size * nplanes || src_plane_size <= 0) if (dst_size < 2LL * src_plane_size * nplanes || src_plane_size <= 0)
return -1; return AVERROR(EINVAL);
for (p = 0; p < nplanes; p++) { for (p = 0; p < nplanes; p++) {
int count = 1; int count = 1;
@ -114,7 +114,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (avctx->width > 65535 || avctx->height > 65535) { if (avctx->width > 65535 || avctx->height > 65535) {
av_log(avctx, AV_LOG_ERROR, "image dimensions do not fit in 16 bits\n"); av_log(avctx, AV_LOG_ERROR, "image dimensions do not fit in 16 bits\n");
return -1; return AVERROR(EINVAL);
} }
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
@ -144,7 +144,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "unsupported pixfmt\n"); av_log(avctx, AV_LOG_ERROR, "unsupported pixfmt\n");
return -1; return AVERROR(EINVAL);
} }
line_bytes = (avctx->width * bpp + 7) >> 3; line_bytes = (avctx->width * bpp + 7) >> 3;
@ -186,7 +186,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if ((written = pcx_rle_encode(buf, buf_end - buf, if ((written = pcx_rle_encode(buf, buf_end - buf,
src, line_bytes, nplanes)) < 0) { src, line_bytes, nplanes)) < 0) {
av_log(avctx, AV_LOG_ERROR, "buffer too small\n"); av_log(avctx, AV_LOG_ERROR, "buffer too small\n");
return -1; return AVERROR_BUG;
} }
buf += written; buf += written;
src += frame->linesize[0]; src += frame->linesize[0];
@ -195,7 +195,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (nplanes == 1 && bpp == 8) { if (nplanes == 1 && bpp == 8) {
if (buf_end - buf < 257) { if (buf_end - buf < 257) {
av_log(avctx, AV_LOG_ERROR, "buffer too small\n"); av_log(avctx, AV_LOG_ERROR, "buffer too small\n");
return -1; return AVERROR_BUG;
} }
bytestream_put_byte(&buf, 12); bytestream_put_byte(&buf, 12);
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {