diff options
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.h | 4 |
2 files changed, 3 insertions, 3 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; 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 |