projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
file.C
diff --git
a/cinelerra-5.1/cinelerra/file.C
b/cinelerra-5.1/cinelerra/file.C
index 0406e174f4f24bb58f81c593b2856e412e22a48d..f0b393029718d8e0acb4632aad13a1f1042020fb 100644
(file)
--- a/
cinelerra-5.1/cinelerra/file.C
+++ b/
cinelerra-5.1/cinelerra/file.C
@@
-1,6
+1,7
@@
/*
* CINELERRA
* Copyright (C) 2010 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 2010 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-390,7
+391,9
@@
const char *File::default_probes[] = {
#ifdef HAVE_GIFLIB
"GIF",
#endif
#ifdef HAVE_GIFLIB
"GIF",
#endif
+#ifdef HAVE_LIBDPX
"DPX",
"DPX",
+#endif
#ifdef HAVE_OPENEXR
"EXR",
#endif
#ifdef HAVE_OPENEXR
"EXR",
#endif
@@
-402,7
+405,9
@@
const char *File::default_probes[] = {
"OGG",
"Vorbis",
#endif
"OGG",
"Vorbis",
#endif
+#ifdef HAVE_LIBZMPEG
"MPEG",
"MPEG",
+#endif
"EDL",
"FFMPEG_Late",
};
"EDL",
"FFMPEG_Late",
};
@@
-1662,7
+1667,14
@@
int File::record_fd()
void File::get_exe_path(char *result, char *bnp)
{
// Get executable path, basename
void File::get_exe_path(char *result, char *bnp)
{
// Get executable path, basename
+#if !defined(__FreeBSD__)
int len = readlink("/proc/self/exe", result, BCTEXTLEN-1);
int len = readlink("/proc/self/exe", result, BCTEXTLEN-1);
+#else
+ char exe_path[BCTEXTLEN];
+ sprintf(exe_path,"/proc/%d/file",getpid());
+ int len = readlink(exe_path, result, BCTEXTLEN-1);
+#endif
+
if( len >= 0 ) {
result[len] = 0;
char *ptr = strrchr(result, '/');
if( len >= 0 ) {
result[len] = 0;
char *ptr = strrchr(result, '/');