diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
commit | 6a436fd826d1c9d88b60287696cc0836ccce35aa (patch) | |
tree | 460a08b4d46359b6b168ece26f592c75fc2fe41f /gtk2_ardour/transcode_ffmpeg.cc | |
parent | bb59def1ca8a21f915cf636dd1e54957df981656 (diff) | |
parent | 4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff) |
fix merge conflict from master
Diffstat (limited to 'gtk2_ardour/transcode_ffmpeg.cc')
-rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 15b9f40919..aedd7d25eb 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -71,18 +71,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) } if (ffmpeg_exe.empty() || ffprobe_exe.empty()) { - warning << _( + warning << string_compose( + _( "No ffprobe or ffmpeg executables could be found on this system.\n" "Video import and export is not possible until you install those tools.\n" - "Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n" + "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n" "\n" - "The tools are included with the Ardour releases from ardour.org " + "The tools are included with the %1 releases from ardour.org " "and also available with the video-server at http://x42.github.com/harvid/\n" "\n" "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n" "If you already have a suitable ffmpeg installation on your system, we recommend creating " "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n" - ) << endmsg; + ), PROGRAM_NAME) << endmsg; return; } ffexecok = true; @@ -395,7 +396,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf } bool -TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t samplerate, unsigned int stream) +TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t /*samplerate*/, unsigned int stream) { if (!probeok) return false; if (stream >= m_audio.size()) return false; |