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_video_dialog.cc | |
| parent | bb59def1ca8a21f915cf636dd1e54957df981656 (diff) | |
| parent | 4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff) | |
fix merge conflict from master
Diffstat (limited to 'gtk2_ardour/transcode_video_dialog.cc')
| -rw-r--r-- | gtk2_ardour/transcode_video_dialog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index 92265284c6..2a4e05f076 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -68,7 +68,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) , bitrate_adjustment (2000, 500, 10000, 10, 100, 0) , bitrate_spinner (bitrate_adjustment) #if 1 /* tentative debug mode */ - , debug_checkbox (_("Debug Mode: Print ffmpeg Command and Output to stdout.")) + , debug_checkbox (_("Debug Mode: Print ffmpeg command and output to stdout.")) #endif { set_session (s); |