aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-08-26 10:23:54 +0000
committerPaul B Mahol <onemda@gmail.com>2012-08-26 10:24:42 +0000
commit8f9941b1608ccdfc24394ee0d5b01c5f7618a134 (patch)
tree7b04d67a5d6280482b18f7f6b63359fd5648822a
parentbfb39023b0b2c79010ba005c195813931c7f2776 (diff)
downloadffmpeg-8f9941b1608ccdfc24394ee0d5b01c5f7618a134.tar.gz
avrndec: silence warning about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--libavcodec/avrndec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c
index 8305028d06..cda360de1a 100644
--- a/libavcodec/avrndec.c
+++ b/libavcodec/avrndec.c
@@ -58,7 +58,7 @@ static av_cold int init(AVCodecContext *avctx)
return 0;
}
-static av_cold void end(AVCodecContext *avctx)
+static av_cold int end(AVCodecContext *avctx)
{
AVRnContext *a = avctx->priv_data;
AVFrame *p = &a->frame;
@@ -68,6 +68,8 @@ static av_cold void end(AVCodecContext *avctx)
if(a->is_mjpeg)
ff_mjpeg_decode_end(avctx);
+
+ return 0;
}
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)