virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

targa: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-17 18:31:20 +01:00
parent 62d9655217
commit 01cbc6f6ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/targa.c
View File

@ -103,7 +103,7 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame * const p = &s->picture; AVFrame * const p = &s->picture;
uint8_t *dst; uint8_t *dst;
int stride; int stride;
int idlen, compr, y, w, h, bpp, flags; int idlen, compr, y, w, h, bpp, flags, ret;
int first_clr, colors, csize; int first_clr, colors, csize;
bytestream2_init(&s->gb, avpkt->data, avpkt->size); bytestream2_init(&s->gb, avpkt->data, avpkt->size);
@ -141,19 +141,19 @@ static int decode_frame(AVCodecContext *avctx,
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", bpp); av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", bpp);
return -1; return AVERROR_INVALIDDATA;
} }
if(s->picture.data[0]) if(s->picture.data[0])
avctx->release_buffer(avctx, &s->picture); avctx->release_buffer(avctx, &s->picture);
if(av_image_check_size(w, h, 0, avctx)) if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
return -1; return ret;
if(w != avctx->width || h != avctx->height) if(w != avctx->width || h != avctx->height)
avcodec_set_dimensions(avctx, w, h); avcodec_set_dimensions(avctx, w, h);
if(ff_get_buffer(avctx, p) < 0){ if ((ret = ff_get_buffer(avctx, p)) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
if(flags & 0x20){ if(flags & 0x20){
dst = p->data[0]; dst = p->data[0];
@ -167,7 +167,7 @@ static int decode_frame(AVCodecContext *avctx,
int pal_size, pal_sample_size; int pal_size, pal_sample_size;
if((colors + first_clr) > 256){ if((colors + first_clr) > 256){
av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr); av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr);
return -1; return AVERROR_INVALIDDATA;
} }
switch (csize) { switch (csize) {
case 24: pal_sample_size = 3; break; case 24: pal_sample_size = 3; break;
@ -175,7 +175,7 @@ static int decode_frame(AVCodecContext *avctx,
case 15: pal_sample_size = 2; break; case 15: pal_sample_size = 2; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Palette entry size %i bits is not supported\n", csize); av_log(avctx, AV_LOG_ERROR, "Palette entry size %i bits is not supported\n", csize);
return -1; return AVERROR_INVALIDDATA;
} }
pal_size = colors * pal_sample_size; pal_size = colors * pal_sample_size;
if(avctx->pix_fmt != AV_PIX_FMT_PAL8)//should not occur but skip palette anyway if(avctx->pix_fmt != AV_PIX_FMT_PAL8)//should not occur but skip palette anyway