projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update libaom via Andrew + 0006 patch LIBZMPEG
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
asset.h
diff --git
a/cinelerra-5.1/cinelerra/asset.h
b/cinelerra-5.1/cinelerra/asset.h
index 92b15794ced82f6f31a2144c87ad78c114564cf4..bb40ed4a32957a3577c2f021e6eff6bde48e346a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/asset.h
+++ b/
cinelerra-5.1/cinelerra/asset.h
@@
-36,12
+36,6
@@
#include "pluginserver.inc"
#include "pluginserver.inc"
-// Time code formats
-#define TC_DROPFRAME 0
-#define TC_NONDROPFRAME 1
-#define TC_PAL 2
-#define TC_FILM 3
-
class Asset : public Indexable, public ListItem<Asset>
{
public:
class Asset : public Indexable, public ListItem<Asset>
{
public:
@@
-147,16
+141,16
@@
public:
int actual_width, actual_height;
int width, height;
int actual_width, actual_height;
int width, height;
-// scale factor or 0 if not proxy
- int proxy_scale;
+// scale factor or 0 if not proxy
, proxy_edl if proxyed from nested_edl
+ int proxy_scale
, proxy_edl
;
// String or FourCC describing compression
char vcodec[BCTEXTLEN];
// Length in frames
// -1 means a still photo
int64_t video_length;
// String or FourCC describing compression
char vcodec[BCTEXTLEN];
// Length in frames
// -1 means a still photo
int64_t video_length;
-
-
+// timecode, unknown=-2, no timecode=-1, timecode>=0
+ double timecode;
// mp3 compression
int mp3_bitrate;
// mp3 compression
int mp3_bitrate;