Use MAP_FAILED to check for mmap failure instead of manually

[ffmpeg] / libavcodec / xl.c

diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index ccff40e17a4bef7943f54abf9b9a523a531880ce..5f19cae3bbf6e240b7690adb43e4afa95cf93a57 100644 (file)
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavcodec/xl.c
+ * @file
  * Miro VideoXL codec.
  */
 
@@ -40,8 +40,10 @@ static const int xl_table[32] = {
 
 static int decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
-                        const uint8_t *buf, int buf_size)
+                        AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     VideoXLContext * const a = avctx->priv_data;
     AVFrame * const p= (AVFrame*)&a->pic;
     uint8_t *Y, *U, *V;
@@ -58,7 +60,7 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    p->pict_type= FF_I_TYPE;
+    p->pict_type= AV_PICTURE_TYPE_I;
     p->key_frame= 1;
 
     Y = a->pic.data[0];
@@ -126,14 +128,24 @@ static av_cold int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-AVCodec xl_decoder = {
+static av_cold int decode_end(AVCodecContext *avctx){
+    VideoXLContext * const a = avctx->priv_data;
+    AVFrame *pic = &a->pic;
+
+    if (pic->data[0])
+        avctx->release_buffer(avctx, pic);
+
+    return 0;
+}
+
+AVCodec ff_xl_decoder = {
     "xl",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VIXL,
     sizeof(VideoXLContext),
     decode_init,
     NULL,
-    NULL,
+    decode_end,
     decode_frame,
     CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),