diff options
| author | Himangi Saraogi <himangi774@gmail.com> | 2015-02-14 00:10:49 +0530 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-02-14 09:24:13 -0800 |
| commit | 7769be590c7aeb2aad26ca723d105cf5203e33d2 (patch) | |
| tree | 93f640275f94568e978012ab7a135eb79c689c17 | |
| parent | eea769df322fac2601a96db195fa7dc8d12a8fbc (diff) | |
| download | ffmpeg-7769be590c7aeb2aad26ca723d105cf5203e33d2.tar.gz | |
vp56: Return meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/vp56.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index b9d3c87936..2f1de5a5a0 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -473,7 +473,7 @@ static int vp56_size_changed(AVCodecContext *avctx) if (s->mb_width > 1000 || s->mb_height > 1000) { ff_set_dimensions(avctx, 0, 0); av_log(avctx, AV_LOG_ERROR, "picture too big\n"); - return -1; + return AVERROR_INVALIDDATA; } s->above_blocks = av_realloc(s->above_blocks, @@ -501,11 +501,11 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (s->has_alpha) { if (remaining_buf_size < 3) - return -1; + return AVERROR_INVALIDDATA; alpha_offset = bytestream_get_be24(&buf); remaining_buf_size -= 3; if (remaining_buf_size < alpha_offset) - return -1; + return AVERROR_INVALIDDATA; } for (is_alpha=0; is_alpha < 1+s->has_alpha; is_alpha++) { @@ -530,20 +530,21 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_frame_unref(s->frames[i]); if (is_alpha) { ff_set_dimensions(avctx, 0, 0); - return -1; + return AVERROR_INVALIDDATA; } } if (!is_alpha) { - if (ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF) < 0) { + int ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF); + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } if (res == VP56_SIZE_CHANGE) if (vp56_size_changed(avctx)) { av_frame_unref(p); - return -1; + return AVERROR_INVALIDDATA; } } |