X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavdevice%2Fdshow.c;h=27048346d1f476a7729c56ebd2483430e6f2bd81;hb=c9e5acad611c77db5f37299a4a50f15922d85a4c;hp=61f0d08a2fcbc6cd830b90c50e0918b7bcf6ced4;hpb=6a56f4e63423d616b2224f654c1794fac25d6cfb;p=ffmpeg

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 61f0d08a2fc..27048346d1f 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -649,7 +649,7 @@ static enum CodecID waveform_codec_id(enum AVSampleFormat sample_fmt)
     }
 }
 
-static enum SampleFormat sample_fmt_bits_per_sample(int bits)
+static enum AVSampleFormat sample_fmt_bits_per_sample(int bits)
 {
     switch (bits) {
     case 8:  return AV_SAMPLE_FMT_U8;
@@ -660,7 +660,7 @@ static enum SampleFormat sample_fmt_bits_per_sample(int bits)
 }
 
 static int
-dshow_add_device(AVFormatContext *avctx, AVFormatParameters *ap,
+dshow_add_device(AVFormatContext *avctx,
                  enum dshowDeviceType devtype)
 {
     struct dshow_ctx *ctx = avctx->priv_data;
@@ -784,7 +784,7 @@ static int parse_device_name(AVFormatContext *avctx)
     return ret;
 }
 
-static int dshow_read_header(AVFormatContext *avctx, AVFormatParameters *ap)
+static int dshow_read_header(AVFormatContext *avctx)
 {
     struct dshow_ctx *ctx = avctx->priv_data;
     IGraphBuilder *graph = NULL;
@@ -961,13 +961,12 @@ static const AVClass dshow_class = {
 };
 
 AVInputFormat ff_dshow_demuxer = {
-    "dshow",
-    NULL_IF_CONFIG_SMALL("DirectShow capture"),
-    sizeof(struct dshow_ctx),
-    NULL,
-    dshow_read_header,
-    dshow_read_packet,
-    dshow_read_close,
-    .flags = AVFMT_NOFILE,
-    .priv_class = &dshow_class,
+    .name           = "dshow",
+    .long_name      = NULL_IF_CONFIG_SMALL("DirectShow capture"),
+    .priv_data_size = sizeof(struct dshow_ctx),
+    .read_header    = dshow_read_header,
+    .read_packet    = dshow_read_packet,
+    .read_close     = dshow_read_close,
+    .flags          = AVFMT_NOFILE,
+    .priv_class     = &dshow_class,
 };