Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>tags/n2.3
| @@ -143,6 +143,7 @@ static const AVClass alsa_demuxer_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_alsa_demuxer = { | AVInputFormat ff_alsa_demuxer = { | ||||
| @@ -142,6 +142,13 @@ audio_get_output_timestamp(AVFormatContext *s1, int stream, | |||||
| *dts = s->timestamp - delay; | *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 = { | AVOutputFormat ff_alsa_muxer = { | ||||
| .name = "alsa", | .name = "alsa", | ||||
| .long_name = NULL_IF_CONFIG_SMALL("ALSA audio output"), | .long_name = NULL_IF_CONFIG_SMALL("ALSA audio output"), | ||||
| @@ -154,4 +161,5 @@ AVOutputFormat ff_alsa_muxer = { | |||||
| .write_uncoded_frame = audio_write_frame, | .write_uncoded_frame = audio_write_frame, | ||||
| .get_output_timestamp = audio_get_output_timestamp, | .get_output_timestamp = audio_get_output_timestamp, | ||||
| .flags = AVFMT_NOFILE, | .flags = AVFMT_NOFILE, | ||||
| .priv_class = &alsa_muxer_class, | |||||
| }; | }; | ||||
| @@ -334,6 +334,7 @@ static const AVClass bktr_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_bktr_demuxer = { | AVInputFormat ff_bktr_demuxer = { | ||||
| @@ -224,6 +224,7 @@ static const AVClass caca_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, | |||||
| }; | }; | ||||
| AVOutputFormat ff_caca_muxer = { | AVOutputFormat ff_caca_muxer = { | ||||
| @@ -38,6 +38,7 @@ static const AVClass decklink_muxer_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, | |||||
| }; | }; | ||||
| AVOutputFormat ff_decklink_muxer = { | AVOutputFormat ff_decklink_muxer = { | ||||
| @@ -1081,6 +1081,7 @@ static const AVClass dshow_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_dshow_demuxer = { | AVInputFormat ff_dshow_demuxer = { | ||||
| @@ -224,6 +224,7 @@ static const AVClass dv1394_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_dv1394_demuxer = { | AVInputFormat ff_dv1394_demuxer = { | ||||
| @@ -217,6 +217,7 @@ static const AVClass fbdev_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_fbdev_demuxer = { | AVInputFormat ff_fbdev_demuxer = { | ||||
| @@ -196,6 +196,7 @@ static const AVClass fbdev_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, | |||||
| }; | }; | ||||
| AVOutputFormat ff_fbdev_muxer = { | AVOutputFormat ff_fbdev_muxer = { | ||||
| @@ -483,6 +483,7 @@ static const AVClass iec61883_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_iec61883_demuxer = { | AVInputFormat ff_iec61883_demuxer = { | ||||
| @@ -333,6 +333,7 @@ static const AVClass jack_indev_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_jack_demuxer = { | AVInputFormat ff_jack_demuxer = { | ||||
| @@ -425,6 +425,7 @@ static const AVClass lavfi_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_lavfi_demuxer = { | AVInputFormat ff_lavfi_demuxer = { | ||||
| @@ -177,6 +177,7 @@ static const AVClass libcdio_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_libcdio_demuxer = { | AVInputFormat ff_libcdio_demuxer = { | ||||
| @@ -112,6 +112,7 @@ static const AVClass libdc1394_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| @@ -236,7 +236,8 @@ static const AVClass class = { | |||||
| .class_name = "openal", | .class_name = "openal", | ||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT | |||||
| .version = LIBAVUTIL_VERSION_INT, | |||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_openal_demuxer = { | AVInputFormat ff_openal_demuxer = { | ||||
| @@ -1272,6 +1272,7 @@ static const AVClass opengl_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, | |||||
| }; | }; | ||||
| AVOutputFormat ff_opengl_muxer = { | AVOutputFormat ff_opengl_muxer = { | ||||
| @@ -296,6 +296,7 @@ static const AVClass oss_demuxer_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_oss_demuxer = { | AVInputFormat ff_oss_demuxer = { | ||||
| @@ -311,6 +312,13 @@ AVInputFormat ff_oss_demuxer = { | |||||
| #endif | #endif | ||||
| #if CONFIG_OSS_OUTDEV | #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 = { | AVOutputFormat ff_oss_muxer = { | ||||
| .name = "oss", | .name = "oss", | ||||
| .long_name = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) playback"), | .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_packet = audio_write_packet, | ||||
| .write_trailer = audio_write_trailer, | .write_trailer = audio_write_trailer, | ||||
| .flags = AVFMT_NOFILE, | .flags = AVFMT_NOFILE, | ||||
| .priv_class = &oss_muxer_class, | |||||
| }; | }; | ||||
| #endif | #endif | ||||
| @@ -166,6 +166,7 @@ static const AVClass pulse_demuxer_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_pulse_demuxer = { | AVInputFormat ff_pulse_demuxer = { | ||||
| @@ -167,6 +167,7 @@ static const AVClass pulse_muxer_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, | |||||
| }; | }; | ||||
| AVOutputFormat ff_pulse_muxer = { | AVOutputFormat ff_pulse_muxer = { | ||||
| @@ -358,6 +358,7 @@ static const AVClass sdl_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, | |||||
| }; | }; | ||||
| AVOutputFormat ff_sdl_muxer = { | AVOutputFormat ff_sdl_muxer = { | ||||
| @@ -104,6 +104,7 @@ static const AVClass sndio_demuxer_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_sndio_demuxer = { | AVInputFormat ff_sndio_demuxer = { | ||||
| @@ -76,6 +76,13 @@ static int audio_write_trailer(AVFormatContext *s1) | |||||
| return 0; | 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 = { | AVOutputFormat ff_sndio_muxer = { | ||||
| .name = "sndio", | .name = "sndio", | ||||
| .long_name = NULL_IF_CONFIG_SMALL("sndio audio playback"), | .long_name = NULL_IF_CONFIG_SMALL("sndio audio playback"), | ||||
| @@ -89,4 +96,5 @@ AVOutputFormat ff_sndio_muxer = { | |||||
| .write_packet = audio_write_packet, | .write_packet = audio_write_packet, | ||||
| .write_trailer = audio_write_trailer, | .write_trailer = audio_write_trailer, | ||||
| .flags = AVFMT_NOFILE, | .flags = AVFMT_NOFILE, | ||||
| .priv_class = &sndio_muxer_class, | |||||
| }; | }; | ||||
| @@ -348,6 +348,7 @@ static const AVClass v4l_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_v4l_demuxer = { | AVInputFormat ff_v4l_demuxer = { | ||||
| @@ -1023,6 +1023,7 @@ static const AVClass v4l2_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| AVInputFormat ff_v4l2_demuxer = { | AVInputFormat ff_v4l2_demuxer = { | ||||
| @@ -97,6 +97,13 @@ static int write_trailer(AVFormatContext *s1) | |||||
| return 0; | 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 = { | AVOutputFormat ff_v4l2_muxer = { | ||||
| .name = "v4l2", | .name = "v4l2", | ||||
| .long_name = NULL_IF_CONFIG_SMALL("Video4Linux2 output device"), | .long_name = NULL_IF_CONFIG_SMALL("Video4Linux2 output device"), | ||||
| @@ -107,4 +114,5 @@ AVOutputFormat ff_v4l2_muxer = { | |||||
| .write_packet = write_packet, | .write_packet = write_packet, | ||||
| .write_trailer = write_trailer, | .write_trailer = write_trailer, | ||||
| .flags = AVFMT_NOFILE, | .flags = AVFMT_NOFILE, | ||||
| .priv_class = &v4l2_class, | |||||
| }; | }; | ||||
| @@ -469,6 +469,7 @@ static const AVClass vfw_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT | |||||
| }; | }; | ||||
| AVInputFormat ff_vfwcap_demuxer = { | AVInputFormat ff_vfwcap_demuxer = { | ||||
| @@ -633,6 +633,7 @@ static const AVClass x11_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, | |||||
| }; | }; | ||||
| /** x11 grabber device demuxer declaration */ | /** x11 grabber device demuxer declaration */ | ||||
| @@ -255,6 +255,7 @@ static const AVClass xv_class = { | |||||
| .item_name = av_default_item_name, | .item_name = av_default_item_name, | ||||
| .option = options, | .option = options, | ||||
| .version = LIBAVUTIL_VERSION_INT, | .version = LIBAVUTIL_VERSION_INT, | ||||
| .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, | |||||
| }; | }; | ||||
| AVOutputFormat ff_xv_muxer = { | AVOutputFormat ff_xv_muxer = { | ||||