RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-16 04:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Make the targa encoder return sane error values rather than -1.

Browse Source 
Originally committed as revision 25455 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-10-12 18:44:28 +00:00
parent 7c559bc77e
commit e259eadcab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/targaenc.c
View File

@ -81,12 +81,12 @@ static int targa_encode_frame(AVCodecContext *avctx,
if(avctx->width > 0xffff || avctx->height > 0xffff) {
av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n");
return -1;
return AVERROR(EINVAL);
}
picsize = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
if(buf_size < picsize + 45) {
av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
return -1;
return AVERROR(EINVAL);
}
p->pict_type= FF_I_TYPE;
@ -115,7 +115,7 @@ static int targa_encode_frame(AVCodecContext *avctx,
default:
av_log(avctx, AV_LOG_ERROR, "Pixel format '%s' not supported.\n",
avcodec_get_pix_fmt_name(avctx->pix_fmt));
return -1;
return AVERROR(EINVAL);
}
bpp = outbuf[16] >> 3;