diff options
Diffstat (limited to 'libavdevice/oss_audio.c')
| -rw-r--r-- | libavdevice/oss_audio.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index f1cc91f725..71bf63689a 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -2,20 +2,20 @@ * Linux audio play and grab interface * Copyright (c) 2000, 2001 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -39,7 +39,7 @@ #include "libavutil/opt.h" #include "libavutil/time.h" #include "libavcodec/avcodec.h" -#include "libavformat/avformat.h" +#include "avdevice.h" #include "libavformat/internal.h" #define AUDIO_BLOCK_SIZE 4096 @@ -77,8 +77,11 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi } /* non blocking mode */ - if (!is_output) - fcntl(audio_fd, F_SETFL, O_NONBLOCK); + if (!is_output) { + if (fcntl(audio_fd, F_SETFL, O_NONBLOCK) < 0) { + av_log(s1, AV_LOG_WARNING, "%s: Could not enable non block mode (%s)\n", audio_device, strerror(errno)); + } + } s->frame_size = AUDIO_BLOCK_SIZE; @@ -293,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 = { @@ -308,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"), @@ -321,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 |