aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-17 13:46:51 +0100
committerAnton Khirnov <anton@khirnov.net>2013-01-06 13:31:40 +0100
commita0ffcee1ee813977b6e0834c265846a092373379 (patch)
tree1aacc00862880629583645adc890c183ca0ff109 /libavcodec
parentb2a7b81b9c576c470a459f0e6f8ad0351097d575 (diff)
downloadffmpeg-a0ffcee1ee813977b6e0834c265846a092373379.tar.gz
ptx: return meaningful error codes.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ptx.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c
index d4cd963e46..e8f8bdd72c 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;