summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Yves Avenard <jyavenard@mythtv.org>2011-05-07 10:38:52 (GMT)
committer Jean-Yves Avenard <jyavenard@mythtv.org>2011-05-07 10:38:52 (GMT)
commit7f99d0f1ea49ed69328d0c5d53c65c40c2690e8c (patch)
tree164f3a6f4314f7b80c440e6284eb5147eab215e5
parent5d38c499fd710b4e1cca7c87c5997346fbf84169 (diff)
Following SHA1:7b6c78856da1b8785cc856b6e1ef1ccd35d1947b. Fix improper merge
-rw-r--r--mythtv/libs/libmyth/audiooutputalsa.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/libs/libmyth/audiooutputalsa.cpp b/mythtv/libs/libmyth/audiooutputalsa.cpp
index 7054c9c..1d3c71f 100644
--- a/mythtv/libs/libmyth/audiooutputalsa.cpp
+++ b/mythtv/libs/libmyth/audiooutputalsa.cpp
@@ -69,7 +69,7 @@ AudioOutputALSA::AudioOutputALSA(const AudioSettings &settings) :
if (args < 0)
{
/* no existing parameters: add it behind device name */
- passthru_device += iecarg;
+ passthru_device += ":" + iecarg;
}
else
{