X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=56ce4e5b22d512a09d2f97863e5d321987f24b63;hb=9a75aafbc51be29b49351a51e9084bb34d255c0d;hp=46838b4d92dca56ee8bc0625554ef5b48d0aff3a;hpb=435f84402323118397a408c1b0c90aa59b321286;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 46838b4d..56ce4e5b 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -119,6 +119,7 @@ public:
 	AVFilterContext *buffersrc_ctx;
 	AVFilterGraph *filter_graph;
 	AVFrame *frame, *fframe;
+	AVFrame *probe_frame;
 	AVBSFContext *bsfc;
 
 	FFPacket ipkt;
@@ -262,6 +263,7 @@ public:
 
 	int interlaced;
 	int top_field_first;
+	int color_space, color_range;
 };
 
 class FFCodecRemap
@@ -309,6 +311,8 @@ public:
 	static void load_audio_options(Asset *asset, EDL *edl);
 	static void scan_video_options(Asset *asset, EDL *edl);
 	static void load_video_options(Asset *asset, EDL *edl);
+	static void scan_format_options(Asset *asset, EDL *edl);
+	static void load_format_options(Asset *asset, EDL *edl);
 	static void set_asset_format(Asset *asset, EDL *edl, const char *text);
 	int get_file_format();
 	static int get_encoder(const char *options, char *format, char *codec, char *bsfilter);
@@ -409,8 +413,10 @@ public:
 	int ff_coded_width(int stream);
 	int ff_coded_height(int stream);
 	float ff_aspect_ratio(int stream);
+	int ff_color_range(int stream);
+	int ff_color_space(int stream);
 	double ff_frame_rate(int stream);
-	const char *ff_video_format(int stream);
+	const char *ff_video_codec(int stream);
 	int64_t ff_video_frames(int stream);
 	int ff_video_pid(int stream);
 	int ff_video_mpeg_color_range(int stream);