projects / packages / ardour.git / blame
| Commit | Line | Data |
|---|---|---|
| 5f8dca4a JK |
1 | diff -dur -x '*~' Ardour-5.12.0.orig/gtk2_ardour/po/de.po Ardour-5.12.0/gtk2_ardour/po/de.po |
| 2 | --- Ardour-5.12.0.orig/gtk2_ardour/po/de.po 2017-09-15 22:56:22.000000000 +0200 | |
| 3 | +++ Ardour-5.12.0/gtk2_ardour/po/de.po 2018-10-23 19:27:38.331895133 +0200 | |
| 4 | @@ -16185,12 +16185,6 @@ | |
| 5 | "The tools are included with the %1 releases from ardour.org and also " | |
| 6 | "available with the video-server at http://x42.github.com/harvid/\n" | |
| 7 | "\n" | |
| 8 | -"Important: the files need to be installed in $PATH and named ffmpeg_harvid " | |
| 9 | -"and ffprobe_harvid.\n" | |
| 10 | -"If you already have a suitable ffmpeg installation on your system, we " | |
| 11 | -"recommend creating symbolic links from ffmpeg to ffmpeg_harvid and from " | |
| 12 | -"ffprobe to ffprobe_harvid.\n" | |
| 13 | -"\n" | |
| 14 | "see also http://manual.ardour.org/video-timeline/setup/" | |
| 15 | msgstr "" | |
| 16 | "Auf diesem System konnte keine ffmpeg-Installation gefunden werden.\n" | |
| 17 | @@ -16200,12 +16194,6 @@ | |
| 18 | "Die Werkzeuge sind in den %1-Veröffentlichungen von ardour.org enthalten und " | |
| 19 | "ebenfalls mit dem Videoserver auf http://x42.github.com/harvid/ erhältlich.\n" | |
| 20 | "\n" | |
| 21 | -"Wichtig: Die Dateien müssen in $PATH installiert werden und nach " | |
| 22 | -"ffmpeg_harvid und ffprobe_harvid umbenannt werden.\n" | |
| 23 | -"Falls Sie eine geeignete ffmpeg-Installation auf Ihrem System haben, " | |
| 24 | -"empfehlen wir, symbolische Verknüpfungen von ffmpeg auf ffmpeg_harvid und " | |
| 25 | -"von ffprobe auf ffprobe_harvid zu erzeugen.\n" | |
| 26 | -"\n" | |
| 27 | "Sehen Sie auch http://manual.ardour.org/video-timeline/setup/" | |
| 28 | ||
| 29 | #: transcode_video_dialog.cc:56 | |
| 30 | diff -dur -x '*~' Ardour-5.12.0.orig/gtk2_ardour/transcode_ffmpeg.cc Ardour-5.12.0/gtk2_ardour/transcode_ffmpeg.cc | |
| 31 | --- Ardour-5.12.0.orig/gtk2_ardour/transcode_ffmpeg.cc 2017-09-15 22:56:22.000000000 +0200 | |
| 32 | +++ Ardour-5.12.0/gtk2_ardour/transcode_ffmpeg.cc 2018-10-23 19:27:09.621396487 +0200 | |
| 33 | @@ -60,10 +60,6 @@ | |
| 34 | "The tools are included with the %1 releases from ardour.org " | |
| 35 | "and also available with the video-server at http://x42.github.com/harvid/\n" | |
| 36 | "\n" | |
| 37 | - "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n" | |
| 38 | - "If you already have a suitable ffmpeg installation on your system, we recommend creating " | |
| 39 | - "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n" | |
| 40 | - "\n" | |
| 41 | "see also http://manual.ardour.org/video-timeline/setup/" | |
| 42 | ), PROGRAM_NAME) << endmsg; | |
| 43 | return; | |
| 44 | diff -dur -x '*~' Ardour-5.12.0.orig/gtk2_ardour/video_tool_paths.cc Ardour-5.12.0/gtk2_ardour/video_tool_paths.cc | |
| 45 | --- Ardour-5.12.0.orig/gtk2_ardour/video_tool_paths.cc 2017-09-15 22:56:22.000000000 +0200 | |
| 46 | +++ Ardour-5.12.0/gtk2_ardour/video_tool_paths.cc 2018-10-23 19:26:43.792949900 +0200 | |
| 47 | @@ -166,7 +166,7 @@ | |
| 48 | ffprobe_exe = X_(""); | |
| 49 | ||
| 50 | std::string ff_file_path; | |
| 51 | - if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffmpeg_harvid"), ff_file_path)) { | |
| 52 | + if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffmpeg"), ff_file_path)) { | |
| 53 | ffmpeg_exe = ff_file_path; | |
| 54 | } | |
| 55 | #ifdef PLATFORM_WINDOWS | |
| 56 | @@ -194,7 +194,7 @@ | |
| 57 | } | |
| 58 | #endif | |
| 59 | ||
| 60 | - if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffprobe_harvid"), ff_file_path)) { | |
| 61 | + if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffprobe"), ff_file_path)) { | |
| 62 | ffprobe_exe = ff_file_path; | |
| 63 | } | |
| 64 | #ifdef PLATFORM_WINDOWS |