X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fingenientdec.c;h=2bb70e721f034a60e83e8c15eb3d91e5d07d8e1e;hb=90bc423212396e96a02edc1118982ab7f7766a63;hp=febeb2ec35c69cf8232c1f2c3dbd8e86a00acba4;hpb=e762b1ce9505511b1ecbbd4868ec6879e32e8831;p=ffmpeg

diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c
index febeb2ec35c..2bb70e721f0 100644
--- a/libavformat/ingenientdec.c
+++ b/libavformat/ingenientdec.c
@@ -51,22 +51,23 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
     pkt->stream_index = 0;
     ret = avio_read(s->pb, pkt->data, size);
     if (ret < 0) {
-        av_free_packet(pkt);
+        av_packet_unref(pkt);
         return ret;
     }
     pkt->size = ret;
     return ret;
 }
 
+FF_RAWVIDEO_DEMUXER_CLASS(ingenient)
+
 AVInputFormat ff_ingenient_demuxer = {
-    "ingenient",
-    NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
-    sizeof(FFRawVideoDemuxerContext),
-    NULL,
-    ff_raw_video_read_header,
-    ingenient_read_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "cgi", // FIXME
-    .value = CODEC_ID_MJPEG,
-    .priv_class = &ff_rawvideo_demuxer_class,
+    .name           = "ingenient",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
+    .priv_data_size = sizeof(FFRawVideoDemuxerContext),
+    .read_header    = ff_raw_video_read_header,
+    .read_packet    = ingenient_read_packet,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "cgi", // FIXME
+    .raw_codec_id   = AV_CODEC_ID_MJPEG,
+    .priv_class     = &ingenient_demuxer_class,
 };