diff options
Diffstat (limited to 'libavdevice')
-rw-r--r-- | libavdevice/alsa-audio-dec.c | 1 | ||||
-rw-r--r-- | libavdevice/alsa-audio-enc.c | 8 | ||||
-rw-r--r-- | libavdevice/bktr.c | 1 | ||||
-rw-r--r-- | libavdevice/caca.c | 1 | ||||
-rw-r--r-- | libavdevice/decklink_enc_c.c | 1 | ||||
-rw-r--r-- | libavdevice/dshow.c | 1 | ||||
-rw-r--r-- | libavdevice/dv1394.c | 1 | ||||
-rw-r--r-- | libavdevice/fbdev_dec.c | 1 | ||||
-rw-r--r-- | libavdevice/fbdev_enc.c | 1 | ||||
-rw-r--r-- | libavdevice/iec61883.c | 1 | ||||
-rw-r--r-- | libavdevice/jack_audio.c | 1 | ||||
-rw-r--r-- | libavdevice/lavfi.c | 1 | ||||
-rw-r--r-- | libavdevice/libcdio.c | 1 | ||||
-rw-r--r-- | libavdevice/libdc1394.c | 1 | ||||
-rw-r--r-- | libavdevice/openal-dec.c | 3 | ||||
-rw-r--r-- | libavdevice/opengl_enc.c | 1 | ||||
-rw-r--r-- | libavdevice/oss_audio.c | 9 | ||||
-rw-r--r-- | libavdevice/pulse_audio_dec.c | 1 | ||||
-rw-r--r-- | libavdevice/pulse_audio_enc.c | 1 | ||||
-rw-r--r-- | libavdevice/sdl.c | 1 | ||||
-rw-r--r-- | libavdevice/sndio_dec.c | 1 | ||||
-rw-r--r-- | libavdevice/sndio_enc.c | 8 | ||||
-rw-r--r-- | libavdevice/v4l.c | 1 | ||||
-rw-r--r-- | libavdevice/v4l2.c | 1 | ||||
-rw-r--r-- | libavdevice/v4l2enc.c | 8 | ||||
-rw-r--r-- | libavdevice/vfwcap.c | 1 | ||||
-rw-r--r-- | libavdevice/x11grab.c | 1 | ||||
-rw-r--r-- | libavdevice/xv.c | 1 |
28 files changed, 58 insertions, 1 deletions
diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index 03154b0..2cdf356 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -143,6 +143,7 @@ static const AVClass alsa_demuxer_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_alsa_demuxer = { diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c index bf56fc4..e42cc8f 100644 --- a/libavdevice/alsa-audio-enc.c +++ b/libavdevice/alsa-audio-enc.c @@ -142,6 +142,13 @@ audio_get_output_timestamp(AVFormatContext *s1, int stream, *dts = s->timestamp - delay; } +static const AVClass alsa_muxer_class = { + .class_name = "ALSA muxer", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, +}; + AVOutputFormat ff_alsa_muxer = { .name = "alsa", .long_name = NULL_IF_CONFIG_SMALL("ALSA audio output"), @@ -154,4 +161,5 @@ AVOutputFormat ff_alsa_muxer = { .write_uncoded_frame = audio_write_frame, .get_output_timestamp = audio_get_output_timestamp, .flags = AVFMT_NOFILE, + .priv_class = &alsa_muxer_class, }; diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 4e25aa6..50dcc7d 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -334,6 +334,7 @@ static const AVClass bktr_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_bktr_demuxer = { diff --git a/libavdevice/caca.c b/libavdevice/caca.c index 0a74701..a118064 100644 --- a/libavdevice/caca.c +++ b/libavdevice/caca.c @@ -224,6 +224,7 @@ static const AVClass caca_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, }; AVOutputFormat ff_caca_muxer = { diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c index b98e0b4..7c18043 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -38,6 +38,7 @@ static const AVClass decklink_muxer_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, }; AVOutputFormat ff_decklink_muxer = { diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 5293d26..950e313 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1081,6 +1081,7 @@ static const AVClass dshow_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_dshow_demuxer = { diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 0af5ea5..c8241e3 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -224,6 +224,7 @@ static const AVClass dv1394_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_dv1394_demuxer = { diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c index 14ebab3..01bc7c6 100644 --- a/libavdevice/fbdev_dec.c +++ b/libavdevice/fbdev_dec.c @@ -217,6 +217,7 @@ static const AVClass fbdev_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_fbdev_demuxer = { diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index 8291b59..0fd1c66 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -196,6 +196,7 @@ static const AVClass fbdev_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, }; AVOutputFormat ff_fbdev_muxer = { diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c index a63566e..92b9dc2 100644 --- a/libavdevice/iec61883.c +++ b/libavdevice/iec61883.c @@ -483,6 +483,7 @@ static const AVClass iec61883_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_iec61883_demuxer = { diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index 5ba6731..67f7ac7 100644 --- a/libavdevice/jack_audio.c +++ b/libavdevice/jack_audio.c @@ -333,6 +333,7 @@ static const AVClass jack_indev_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_jack_demuxer = { diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index a177ad0..1ea7ea7 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -425,6 +425,7 @@ static const AVClass lavfi_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_INPUT, }; AVInputFormat ff_lavfi_demuxer = { diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index 91052cc..16a4b26 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -177,6 +177,7 @@ static const AVClass libcdio_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_libcdio_demuxer = { diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 80cb1be..e9bd4c9 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -112,6 +112,7 @@ static const AVClass libdc1394_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; diff --git a/libavdevice/openal-dec.c b/libavdevice/openal-dec.c index 93633ff..4c4ba28 100644 --- a/libavdevice/openal-dec.c +++ b/libavdevice/openal-dec.c @@ -236,7 +236,8 @@ static const AVClass class = { .class_name = "openal", .item_name = av_default_item_name, .option = options, - .version = LIBAVUTIL_VERSION_INT + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_openal_demuxer = { diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 1b99390..6be0398 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -1272,6 +1272,7 @@ static const AVClass opengl_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, }; AVOutputFormat ff_opengl_muxer = { diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index 916908c..71bf636 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -296,6 +296,7 @@ static const AVClass oss_demuxer_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_oss_demuxer = { @@ -311,6 +312,13 @@ AVInputFormat ff_oss_demuxer = { #endif #if CONFIG_OSS_OUTDEV +static const AVClass oss_muxer_class = { + .class_name = "OSS muxer", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, +}; + AVOutputFormat ff_oss_muxer = { .name = "oss", .long_name = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) playback"), @@ -324,5 +332,6 @@ AVOutputFormat ff_oss_muxer = { .write_packet = audio_write_packet, .write_trailer = audio_write_trailer, .flags = AVFMT_NOFILE, + .priv_class = &oss_muxer_class, }; #endif diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c index 3b5cebb..49d6f7e 100644 --- a/libavdevice/pulse_audio_dec.c +++ b/libavdevice/pulse_audio_dec.c @@ -166,6 +166,7 @@ static const AVClass pulse_demuxer_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_pulse_demuxer = { diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c index e047299..4fb64ed 100644 --- a/libavdevice/pulse_audio_enc.c +++ b/libavdevice/pulse_audio_enc.c @@ -167,6 +167,7 @@ static const AVClass pulse_muxer_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, }; AVOutputFormat ff_pulse_muxer = { diff --git a/libavdevice/sdl.c b/libavdevice/sdl.c index bef5041..b98aae5 100644 --- a/libavdevice/sdl.c +++ b/libavdevice/sdl.c @@ -358,6 +358,7 @@ static const AVClass sdl_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, }; AVOutputFormat ff_sdl_muxer = { diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c index 806f478..37c6983 100644 --- a/libavdevice/sndio_dec.c +++ b/libavdevice/sndio_dec.c @@ -104,6 +104,7 @@ static const AVClass sndio_demuxer_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_sndio_demuxer = { diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c index 84d070e..205cf24 100644 --- a/libavdevice/sndio_enc.c +++ b/libavdevice/sndio_enc.c @@ -76,6 +76,13 @@ static int audio_write_trailer(AVFormatContext *s1) return 0; } +static const AVClass sndio_muxer_class = { + .class_name = "sndio outdev", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, +}; + AVOutputFormat ff_sndio_muxer = { .name = "sndio", .long_name = NULL_IF_CONFIG_SMALL("sndio audio playback"), @@ -89,4 +96,5 @@ AVOutputFormat ff_sndio_muxer = { .write_packet = audio_write_packet, .write_trailer = audio_write_trailer, .flags = AVFMT_NOFILE, + .priv_class = &sndio_muxer_class, }; diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index bf2c9e3..d33f714 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -348,6 +348,7 @@ static const AVClass v4l_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_v4l_demuxer = { diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 96a272c..c671e3a 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -1023,6 +1023,7 @@ static const AVClass v4l2_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_v4l2_demuxer = { diff --git a/libavdevice/v4l2enc.c b/libavdevice/v4l2enc.c index 21f0ef6..efe08b5 100644 --- a/libavdevice/v4l2enc.c +++ b/libavdevice/v4l2enc.c @@ -97,6 +97,13 @@ static int write_trailer(AVFormatContext *s1) return 0; } +static const AVClass v4l2_class = { + .class_name = "V4L2 outdev", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, +}; + AVOutputFormat ff_v4l2_muxer = { .name = "v4l2", .long_name = NULL_IF_CONFIG_SMALL("Video4Linux2 output device"), @@ -107,4 +114,5 @@ AVOutputFormat ff_v4l2_muxer = { .write_packet = write_packet, .write_trailer = write_trailer, .flags = AVFMT_NOFILE, + .priv_class = &v4l2_class, }; diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 014f18c..e5d9593 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -469,6 +469,7 @@ static const AVClass vfw_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT }; AVInputFormat ff_vfwcap_demuxer = { diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 0e7b6ae..d38c55d 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -633,6 +633,7 @@ static const AVClass x11_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; /** x11 grabber device demuxer declaration */ diff --git a/libavdevice/xv.c b/libavdevice/xv.c index 89d6575..ab08e3e 100644 --- a/libavdevice/xv.c +++ b/libavdevice/xv.c @@ -255,6 +255,7 @@ static const AVClass xv_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, }; AVOutputFormat ff_xv_muxer = { |