projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve ffmpeg format selection popup menu, more ffmpeg audio fixes
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
asset.h
diff --git
a/cinelerra-5.0/cinelerra/asset.h
b/cinelerra-5.0/cinelerra/asset.h
index f20fbf452b40d623448cf0d7630446b9c391a475..8fe38692f4910824840d397f8d49a888bcbb2b62 100644
(file)
--- a/
cinelerra-5.0/cinelerra/asset.h
+++ b/
cinelerra-5.0/cinelerra/asset.h
@@
-147,13
+147,6
@@
public:
int64_t audio_length;
int64_t audio_length;
-// Timecode information. User setable, in case of errors in source
- char reel_name[BCTEXTLEN];
- int reel_number;
- int64_t tcstart;
- int64_t tcend;
- int tcformat;
-
// contains video data
int video_data;
int layers, program;
// contains video data
int video_data;
int layers, program;
@@
-220,12
+213,13
@@
public:
int vmpeg_field_order;
int vmpeg_pframe_distance;
int vmpeg_field_order;
int vmpeg_pframe_distance;
-
-
-
-
-
-
+// ffmpeg muxer file extension
+ char fformat[BCSTRLEN];
+ char ff_audio_options[BCTEXTLEN];
+ char ff_video_options[BCTEXTLEN];
+ int ff_audio_bitrate;
+ int ff_video_bitrate;
+ int ff_video_quality;
// Divx video compression
int divx_bitrate;
// Divx video compression
int divx_bitrate;
@@
-269,9
+263,6
@@
public:
int ac3_bitrate;
int ac3_bitrate;
- char pipe[BCTEXTLEN];
- int use_pipe;
-
// Image file sequences. Background rendering doesn't want to write a
// sequence header but instead wants to start the sequence numbering at a certain
// number. This ensures deletion of all the frames which aren't being used.
// Image file sequences. Background rendering doesn't want to write a
// sequence header but instead wants to start the sequence numbering at a certain
// number. This ensures deletion of all the frames which aren't being used.