doc/demuxers.texi: avoid comma splice in image2 documentation

[ffmpeg] / libavdevice / oss_audio.c

diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index c86d2b43027dd37135deb10f9382977a3e444165..f8843a37f94a2a4ed2fc000113bb67a0e215af32 100644 (file)
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -33,11 +33,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/select.h>
 
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
+#include "libavutil/time.h"
 #include "libavcodec/avcodec.h"
 #include "avdevice.h"
 #include "libavformat/internal.h"
@@ -297,7 +296,7 @@ static const AVClass oss_demuxer_class = {
 
 AVInputFormat ff_oss_demuxer = {
     .name           = "oss",
-    .long_name      = NULL_IF_CONFIG_SMALL("Open Sound System capture"),
+    .long_name      = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) capture"),
     .priv_data_size = sizeof(AudioData),
     .read_header    = audio_read_header,
     .read_packet    = audio_read_packet,
@@ -310,7 +309,7 @@ AVInputFormat ff_oss_demuxer = {
 #if CONFIG_OSS_OUTDEV
 AVOutputFormat ff_oss_muxer = {
     .name           = "oss",
-    .long_name      = NULL_IF_CONFIG_SMALL("Open Sound System playback"),
+    .long_name      = NULL_IF_CONFIG_SMALL("OSS (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