diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/transcode_video_dialog.cc | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/transcode_video_dialog.cc')
| -rw-r--r-- | gtk2_ardour/transcode_video_dialog.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index 2a4e05f076..9f18e85b64 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -52,6 +52,7 @@ using namespace Gtk; using namespace std; using namespace PBD; using namespace ARDOUR; +using namespace VideoUtils; TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) : ArdourDialog (_("Transcode/Import Video File ")) @@ -111,7 +112,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) bool ffok = false; if (!transcoder->ffexec_ok()) { - l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log widow for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l->set_line_wrap(); options_box->pack_start (*l, false, true, 4); aspect_checkbox.set_sensitive(false); |