[FFmpeg-cvslog] avrndec: silence warning about incompatible pointer types
Paul B Mahol
git at videolan.org
Sun Aug 26 12:52:57 CEST 2012
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Aug 26 10:23:54 2012 +0000| [8f9941b1608ccdfc24394ee0d5b01c5f7618a134] | committer: Paul B Mahol
avrndec: silence warning about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f9941b1608ccdfc24394ee0d5b01c5f7618a134
---
libavcodec/avrndec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c
index 8305028..cda360d 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)
More information about the ffmpeg-cvslog
mailing list