X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=8673e6f39fb10eb4aba5e3a76456bf2bdd83b3d0;hb=8b3b351f3703224915cf26d1b01d1d8ee632a178;hp=37a999298b0487c9ce726015f61dfd616e97bba6;hpb=9df45f6232e108a5f36ba415ff7da8a51ca9dbdc;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 37a99929..8673e6f3 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1134,13 +1134,15 @@ AVRational FFMPEG::to_time_base(int sample_rate)
 
 void FFMPEG::set_option_path(char *path, const char *fmt, ...)
 {
-	get_exe_path(path);
-	strcat(path, "/ffmpeg/");
+	char *ep = path + BCTEXTLEN-1;
+	strncpy(path, File::get_cindat_path(), ep-path);
+	strncat(path, "/ffmpeg/", ep-path);
 	path += strlen(path);
 	va_list ap;
 	va_start(ap, fmt);
-	vsprintf(path, fmt, ap);
+	path += vsnprintf(path, ep-path, fmt, ap);
 	va_end(ap);
+	*path = 0;
 }
 
 void FFMPEG::get_option_path(char *path, const char *type, const char *spec)