From 748de7e794dbff2bf76510c5311bfefd71469007 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 14 Jun 2013 13:49:07 +0200
Subject: avoid name-conflict

when compiled with -rdynamic, "AudioStream" symbol
conflicts with AspectVST.so
---
 gtk2_ardour/transcode_ffmpeg.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gtk2_ardour/transcode_ffmpeg.h')

diff --git a/gtk2_ardour/transcode_ffmpeg.h b/gtk2_ardour/transcode_ffmpeg.h
index 932bfe051b..d1f445bf48 100644
--- a/gtk2_ardour/transcode_ffmpeg.h
+++ b/gtk2_ardour/transcode_ffmpeg.h
@@ -25,12 +25,12 @@
 #include "system_exec.h"
 
 /* TODO: use a namespace here ? */
-struct AudioStream {
+struct FFAudioStream {
 	std::string name;
 	std::string stream_id;
 	uint32_t channels;
 };
-typedef std::vector<AudioStream> AudioStreams;
+typedef std::vector<FFAudioStream> AudioStreams;
 typedef std::map<std::string,std::string> FFSettings;
 
 /** @class TranscodeFfmpeg
-- 
cgit v1.2.3