git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b2a7b81
)
ptx: return meaningful error codes.
author
Anton Khirnov
<anton@khirnov.net>
Sat, 17 Nov 2012 12:46:51 +0000
(13:46 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Sun, 6 Jan 2013 12:31:40 +0000
(13:31 +0100)
libavcodec/ptx.c
patch
|
blob
|
history
diff --git
a/libavcodec/ptx.c
b/libavcodec/ptx.c
index
d4cd963
..
e8f8bdd
100644
(file)
--- 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;
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)
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 (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 (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");
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return
-1
;
+ return
ret
;
}
p->pict_type = AV_PICTURE_TYPE_I;
}
p->pict_type = AV_PICTURE_TYPE_I;