[FFmpeg-devel] [PATCH 1/4] lavd/pulse_audio_enc: rename device param into audio_device

Lukasz Marek lukasz.m.luki at gmail.com
Fri Oct 11 00:39:36 CEST 2013


device may refer for both audio and video device.
audio_device is clear.

Signed-off-by: Lukasz Marek <lukasz.m.luki at gmail.com>
---
 doc/outdevs.texi              |    2 +-
 libavdevice/pulse_audio_enc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/outdevs.texi b/doc/outdevs.texi
index 55c9110..da186bc 100644
--- a/doc/outdevs.texi
+++ b/doc/outdevs.texi
@@ -131,7 +131,7 @@ by default it is the @code{LIBAVFORMAT_IDENT} string.
 Specify the stream name PulseAudio will use when showing active streams,
 by default it is set to the specified output name.
 
- at item device
+ at item audio_device
 Specify the device to use. Default device is used when not provided.
 List of output devices can be obtained with command @command{pactl list sinks}.
 
diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c
index a018b57..6166f13 100644
--- a/libavdevice/pulse_audio_enc.c
+++ b/libavdevice/pulse_audio_enc.c
@@ -130,7 +130,7 @@ static const AVOption options[] = {
     { "server",        "set PulseAudio server",  OFFSET(server),      AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E },
     { "name",          "set application name",   OFFSET(name),        AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT},  0, 0, E },
     { "stream_name",   "set stream description", OFFSET(stream_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E },
-    { "device",        "set device name",        OFFSET(device),      AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E },
+    { "audio_device",  "set device name",        OFFSET(device),      AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E },
     { NULL }
 };
 
-- 
1.7.10.4



More information about the ffmpeg-devel mailing list