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.cc | |
| parent | 80a13145f398e1c4ea22b3f8a25a5b38d3c5e328 (diff) | |
avoid name-conflict
when compiled with -rdynamic, "AudioStream" symbol
conflicts with AspectVST.so
Diffstat (limited to 'gtk2_ardour/transcode_ffmpeg.cc')
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 6e8bd07e93..f14e472815 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -211,7 +211,7 @@ TranscodeFfmpeg::probe () } } else if (i->at(5) == X_("codec_type=audio")) { /* new ffprobe */ - AudioStream as; + FFAudioStream as; for (std::vector<std::string>::iterator kv = i->begin(); kv != i->end(); ++kv) { const size_t kvsep = kv->find('='); if(kvsep == std::string::npos) continue; |