summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2012-02-13 21:14:19 +0100
committerJanne Grunau <janne-libav@jannau.net>2012-02-14 14:42:55 +0100
commit29330721b0e8514f9f8b4d54be75a662a2b79e44 (patch)
tree9079eb2e7830bd7e5fd7ca5bc9a712a8dbca07fa /libavcodec
parentbf61ef2316b6b6eac815fe5ada98d2ed41086164 (diff)
downloadffmpeg-streaming-29330721b0e8514f9f8b4d54be75a662a2b79e44.zip
ffmpeg-streaming-29330721b0e8514f9f8b4d54be75a662a2b79e44.tar.gz
rv34: use AVERROR return values in ff_rv34_decode_frame()
Also adds an error message.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/rv34.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index e6af079..7683a0f 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1652,15 +1652,19 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
if(get_slice_offset(avctx, slices_hdr, 0) < 0 ||
get_slice_offset(avctx, slices_hdr, 0) > buf_size){
av_log(avctx, AV_LOG_ERROR, "Slice offset is invalid\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
init_get_bits(&s->gb, buf+get_slice_offset(avctx, slices_hdr, 0), (buf_size-get_slice_offset(avctx, slices_hdr, 0))*8);
if(r->parse_slice_header(r, &r->s.gb, &si) < 0 || si.start){
av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n");
- return -1;
+ return AVERROR_INVALIDDATA;
+ }
+ if ((!s->last_picture_ptr || !s->last_picture_ptr->f.data[0]) &&
+ si.type == AV_PICTURE_TYPE_B) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid decoder state: B-frame without "
+ "reference data.\n");
+ return AVERROR_INVALIDDATA;
}
- if ((!s->last_picture_ptr || !s->last_picture_ptr->f.data[0]) && si.type == AV_PICTURE_TYPE_B)
- return -1;
if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==AV_PICTURE_TYPE_B)
|| (avctx->skip_frame >= AVDISCARD_NONKEY && si.type!=AV_PICTURE_TYPE_I)
|| avctx->skip_frame >= AVDISCARD_ALL)
OpenPOWER on IntegriCloud