Module: libav Branch: master Commit: a0ffcee1ee813977b6e0834c265846a092373379
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sat Nov 17 13:46:51 2012 +0100 ptx: return meaningful error codes. --- libavcodec/ptx.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index d4cd963..e8f8bdd 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -46,6 +46,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVFrame *picture = data; AVFrame * const p = &s->picture; unsigned int offset, w, h, y, stride, bytes_per_pixel; + int ret; uint8_t *ptr; if (buf_end - buf < 14) @@ -72,13 +73,13 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (p->data[0]) avctx->release_buffer(avctx, p); - if (av_image_check_size(w, h, 0, avctx)) - return -1; + if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) + return ret; if (w != avctx->width || h != avctx->height) 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"); - return -1; + return ret; } p->pict_type = AV_PICTURE_TYPE_I; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
