RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-18 04:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Make XAN decoder return meaningful error codes.

Browse Source 
Originally committed as revision 25516 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-10-18 13:19:53 +00:00
parent a3a29c2651
commit 082a857522
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/xan.c
View File

@ -69,7 +69,7 @@ static av_cold int xan_decode_init(AVCodecContext *avctx)
if ((avctx->codec->id == CODEC_ID_XAN_WC3) && if ((avctx->codec->id == CODEC_ID_XAN_WC3) &&
(s->avctx->palctrl == NULL)) { (s->avctx->palctrl == NULL)) {
av_log(avctx, AV_LOG_ERROR, " WC3 Xan video: palette expected.\n"); av_log(avctx, AV_LOG_ERROR, " WC3 Xan video: palette expected.\n");
return -1; return AVERROR(EINVAL);
} }
avctx->pix_fmt = PIX_FMT_PAL8; avctx->pix_fmt = PIX_FMT_PAL8;
@ -77,12 +77,12 @@ static av_cold int xan_decode_init(AVCodecContext *avctx)
s->buffer1_size = avctx->width * avctx->height; s->buffer1_size = avctx->width * avctx->height;
s->buffer1 = av_malloc(s->buffer1_size); s->buffer1 = av_malloc(s->buffer1_size);
if (!s->buffer1) if (!s->buffer1)
return -1; return AVERROR(ENOMEM);
s->buffer2_size = avctx->width * avctx->height; s->buffer2_size = avctx->width * avctx->height;
s->buffer2 = av_malloc(s->buffer2_size + 130); s->buffer2 = av_malloc(s->buffer2_size + 130);
if (!s->buffer2) { if (!s->buffer2) {
av_freep(&s->buffer1); av_freep(&s->buffer1);
return -1; return AVERROR(ENOMEM);
} }
return 0; return 0;
@ -359,13 +359,13 @@ static int xan_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt) AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int ret, buf_size = avpkt->size;
XanContext *s = avctx->priv_data; XanContext *s = avctx->priv_data;
AVPaletteControl *palette_control = avctx->palctrl; AVPaletteControl *palette_control = avctx->palctrl;
if (avctx->get_buffer(avctx, &s->current_frame)) { if ((ret = avctx->get_buffer(avctx, &s->current_frame))) {
av_log(s->avctx, AV_LOG_ERROR, " Xan Video: get_buffer() failed\n"); av_log(s->avctx, AV_LOG_ERROR, " Xan Video: get_buffer() failed\n");
return -1; return ret;
} }
s->current_frame.reference = 3; s->current_frame.reference = 3;