diff options
| author | Robin Gareus <robin@gareus.org> | 2013-06-14 13:49:07 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-06-14 13:58:55 +0200 |
| commit | 748de7e794dbff2bf76510c5311bfefd71469007 (patch) | |
| tree | 2f2fe4c1979eaece5dae0dbb5d9f5a4057df100b /gtk2_ardour/transcode_ffmpeg.h | |
| parent | 80a13145f398e1c4ea22b3f8a25a5b38d3c5e328 (diff) | |
avoid name-conflict
when compiled with -rdynamic, "AudioStream" symbol
conflicts with AspectVST.so
Diffstat (limited to 'gtk2_ardour/transcode_ffmpeg.h')
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |