Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

[ffmpeg] / libavformat / diracdec.c

diff --git a/libavformat/diracdec.c b/libavformat/diracdec.c
index 6c6896163bb293d08318d77723119af2de49f2f2..6afda533dcd2f2aeed30cae4ecaf8587d93f9361 100644 (file)
--- a/libavformat/diracdec.c
+++ b/libavformat/diracdec.c
@@ -31,13 +31,4 @@ static int dirac_probe(AVProbeData *p)
         return 0;
 }
 
-AVInputFormat ff_dirac_demuxer = {
-    "dirac",
-    NULL_IF_CONFIG_SMALL("raw Dirac"),
-    0,
-    dirac_probe,
-    ff_raw_video_read_header,
-    ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .value = CODEC_ID_DIRAC,
-};
+FF_DEF_RAWVIDEO_DEMUXER(dirac, "raw Dirac", dirac_probe, NULL, CODEC_ID_DIRAC)