projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
formattools.h
diff --git
a/cinelerra-5.0/cinelerra/formattools.h
b/cinelerra-5.0/cinelerra/formattools.h
index 7c626bf13bfc0b2edf1b9abdc99478e4ec13e3d5..4bd4221b08d48d31c2f3169b642b5a2b18a62c31 100644
(file)
--- a/
cinelerra-5.0/cinelerra/formattools.h
+++ b/
cinelerra-5.0/cinelerra/formattools.h
@@
-28,6
+28,7
@@
#include "browsebutton.h"
#include "compresspopup.h"
#include "file.inc"
#include "browsebutton.h"
#include "compresspopup.h"
#include "file.inc"
+#include "ffmpeg.h"
#include "formatpopup.h"
#include "mwindow.inc"
#include "formatpopup.h"
#include "mwindow.inc"
@@
-164,6
+165,9
@@
public:
int handle_event();
FormatTools *format;
int handle_event();
FormatTools *format;
+ static int load_defaults(const char *path, const char *type,
+ char *codec, char *codec_options, int len);
+
// squash show/hide window
int show_window(int flush=1) { return 0; }
int hide_window(int flush=1) { return 0; }
// squash show/hide window
int show_window(int flush=1) { return 0; }
int hide_window(int flush=1) { return 0; }