Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / avrndec.c

diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c
index d9f33d703ca8969359f01419c94bcf4f725d999f..cda360de1af4c71e8ed7db107fc5e68a400746d1 100644 (file)
--- 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)
@@ -118,14 +120,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
 }
 
 AVCodec ff_avrn_decoder = {
-    .name           = "AVRn",
+    .name           = "avrn",
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_AVRN,
     .priv_data_size = sizeof(AVRnContext),
     .init           = init,
     .close          = end,
     .decode         = decode_frame,
-    .long_name      = NULL_IF_CONFIG_SMALL("AVRn"),
+    .long_name      = NULL_IF_CONFIG_SMALL("Avid AVI Codec"),
     .capabilities   = CODEC_CAP_DR1,
 };