projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove old quicktime, replaced with current ffmpeg
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
record.C
diff --git
a/cinelerra-5.0/cinelerra/record.C
b/cinelerra-5.0/cinelerra/record.C
index 42cd9da4e3ff94d2aa4a114ec25d38bf1be7f124..ffa2b2825e4b87b865200019be04a0bb97fc6722 100644
(file)
--- a/
cinelerra-5.0/cinelerra/record.C
+++ b/
cinelerra-5.0/cinelerra/record.C
@@
-39,7
+39,6
@@
#include "errorbox.h"
#include "file.h"
#include "filexml.h"
#include "errorbox.h"
#include "file.h"
#include "filexml.h"
-#include "filemov.h"
#include "filesystem.h"
#include "filethread.h"
#include "format.inc"
#include "filesystem.h"
#include "filethread.h"
#include "format.inc"
@@
-48,6
+47,8
@@
#include "keys.h"
#include "language.h"
#include "localsession.h"
#include "keys.h"
#include "language.h"
#include "localsession.h"
+#include "libdv.h"
+#include "libmjpeg.h"
#include "mainmenu.h"
#include "mainundo.h"
#include "mwindow.h"
#include "mainmenu.h"
#include "mainundo.h"
#include "mwindow.h"
@@
-56,7
+57,6
@@
#include "picture.h"
#include "playbackengine.h"
#include "preferences.h"
#include "picture.h"
#include "playbackengine.h"
#include "preferences.h"
-#include "quicktime.h"
#include "record.h"
#include "recordaudio.h"
#include "recordconfig.h"
#include "record.h"
#include "recordaudio.h"
#include "recordconfig.h"
@@
-200,23
+200,25
@@
int Record::load_defaults()
default_asset->layers = 1;
// Fix encoding parameters depending on driver.
// These are locked by a specific driver.
default_asset->layers = 1;
// Fix encoding parameters depending on driver.
// These are locked by a specific driver.
+ const char *vcodec = 0;
switch( session->vconfig_in->driver ) {
case CAPTURE_LML:
case CAPTURE_BUZ:
switch( session->vconfig_in->driver ) {
case CAPTURE_LML:
case CAPTURE_BUZ:
-
strncpy(default_asset->vcodec, QUICKTIME_MJPA, 4)
;
+
vcodec = CODEC_TAG_MJPEG
;
break;
case CAPTURE_DVB:
case VIDEO4LINUX2MPEG:
break;
case VIDEO4LINUX2JPEG:
break;
case CAPTURE_DVB:
case VIDEO4LINUX2MPEG:
break;
case VIDEO4LINUX2JPEG:
- if( strncmp(default_asset->vcodec,QUICKTIME_MJPG,4) != 0 )
- strncpy(default_asset->vcodec,QUICKTIME_MJPA,4);
+ vcodec = CODEC_TAG_MJPEG;
break;
case CAPTURE_FIREWIRE:
case CAPTURE_IEC61883:
break;
case CAPTURE_FIREWIRE:
case CAPTURE_IEC61883:
-
strncpy(default_asset->vcodec, QUICKTIME_DVSD, 4)
;
+
vcodec = CODEC_TAG_DVSD
;
break;
}
break;
}
+ if( vcodec )
+ strcpy(default_asset->vcodec, vcodec);
record_batches.load_defaults(channeldb, this);
record_batches.load_defaults(channeldb, this);