avoid name-conflict
when compiled with -rdynamic, "AudioStream" symbol conflicts with AspectVST.so
This commit is contained in:
parent
80a13145f3
commit
748de7e794
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user