diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-09-23 20:50:11 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-09-24 12:11:17 +0200 |
| commit | 30b4ee7901ec5dbe24f1c75c0c0b43ba551c858b (patch) | |
| tree | 1280949167f244216ee5ef382be0928a1abbe4e2 /libavdevice/oss_audio.c | |
| parent | 9ff6d0791b220d80844b45c9217113306a50a6cc (diff) | |
| download | ffmpeg-30b4ee7901ec5dbe24f1c75c0c0b43ba551c858b.tar.gz | |
Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
Diffstat (limited to 'libavdevice/oss_audio.c')
| -rw-r--r-- | libavdevice/oss_audio.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index 6df7f34d7e..c19c67784d 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -295,33 +295,30 @@ static const AVClass oss_demuxer_class = { }; AVInputFormat ff_oss_demuxer = { - "oss", - NULL_IF_CONFIG_SMALL("Open Sound System capture"), - sizeof(AudioData), - NULL, - audio_read_header, - audio_read_packet, - audio_read_close, - .flags = AVFMT_NOFILE, - .priv_class = &oss_demuxer_class, + .name = "oss", + .long_name = NULL_IF_CONFIG_SMALL("Open Sound System capture"), + .priv_data_size = sizeof(AudioData), + .read_header = audio_read_header, + .read_packet = audio_read_packet, + .read_close = audio_read_close, + .flags = AVFMT_NOFILE, + .priv_class = &oss_demuxer_class, }; #endif #if CONFIG_OSS_OUTDEV AVOutputFormat ff_oss_muxer = { - "oss", - NULL_IF_CONFIG_SMALL("Open Sound System playback"), - "", - "", - sizeof(AudioData), + .name = "oss", + .long_name = NULL_IF_CONFIG_SMALL("Open Sound System playback"), + .priv_data_size = sizeof(AudioData), /* XXX: we make the assumption that the soundcard accepts this format */ /* XXX: find better solution with "preinit" method, needed also in other formats */ - AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE), - CODEC_ID_NONE, - audio_write_header, - audio_write_packet, - audio_write_trailer, - .flags = AVFMT_NOFILE, + .audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE), + .video_codec = CODEC_ID_NONE, + .write_header = audio_write_header, + .write_packet = audio_write_packet, + .write_trailer = audio_write_trailer, + .flags = AVFMT_NOFILE, }; #endif |