X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=b877c47d938d1ccfb29184c673ceb12116f9da80;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=26fbfd7081b3c7fc9f4c404c1d8329dd254d811f;hpb=101d92b4c50a831fb00edd65df57de41b408c7b6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index 26fbfd70..b877c47d 100644
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -96,8 +96,6 @@ public:
 	int read_index(FileXML *xml);
 	void reset_audio();
 	void reset_video();
-	int set_timecode(char *tc, int format, int end);
-	int reset_timecode();
 
 // Output path is the path of the output file if name truncation is desired.
 // It is a "" if; complete names should be used.
@@ -146,19 +144,13 @@ public:
 	int layers, program;
 	double frame_rate;
 
-// 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;
-
 	int actual_width, actual_height;
 	int width, height;
 // String or FourCC describing compression
 	char vcodec[BCTEXTLEN];
 
 // Length in frames
+// -1 means a still photo
 	int64_t video_length;
 
 
@@ -216,11 +208,12 @@ public:
 
 // 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;
+	char ff_pixel_format[BCSTRLEN];
+	int ff_video_bitrate, ff_video_quality;
+	char ff_audio_options[BCTEXTLEN];
+	char ff_sample_format[BCSTRLEN];
+	int ff_audio_bitrate, ff_audio_quality;
 
 // PNG video compression
 	int png_use_alpha;
@@ -235,6 +228,9 @@ public:
 
 	int ac3_bitrate;
 
+// Insert tag for spherical playback
+	int mov_sphere, jpeg_sphere;
+
 // 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.