X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=f665fa922a5b6afc9e0ce0cabdd168543c7d7431;hb=101d92b4c50a831fb00edd65df57de41b408c7b6;hp=a0eaf61726c49cf36919b0bca3327973b3233571;hpb=28327674e68a9641ffc542190a95fad05e1023ac;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index a0eaf617..f665fa92 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -211,12 +211,12 @@ public:
 
 	int convert_picture_vframe(VFrame *frame, AVFrame *ip);
 	int convert_picture_vframe(VFrame *frame, AVFrame *ip, AVFrame *ipic);
-	int convert_cmodel(VFrame *frame_out, AVFrame *ip);
-	int transfer_cmodel(VFrame *frame_in, AVFrame *ifp);
+	int convert_cmodel(VFrame *frame, AVFrame *ip);
+	int transfer_cmodel(VFrame *frame, AVFrame *ifp);
 	int convert_vframe_picture(VFrame *frame, AVFrame *op);
 	int convert_vframe_picture(VFrame *frame, AVFrame *op, AVFrame *opic);
 	int convert_pixfmt(VFrame *frame, AVFrame *op);
-	int transfer_pixfmt(VFrame *frame_in, AVFrame *ofp);
+	int transfer_pixfmt(VFrame *frame, AVFrame *ofp);
 };
 
 class FFVideoStream : public FFStream, public FFVideoConvert {
@@ -243,9 +243,8 @@ public:
 	int64_t length;
 	float aspect_ratio;
 
-	uint8_t *pkt_bfr;
-	int pkt_bfr_sz;
-	int64_t start_pts;
+	int interlaced;
+	int top_field_first;
 };
 
 class FFMPEG : public Thread {
@@ -272,7 +271,7 @@ public:
 		char *format, char *codec, char *bsfilter, char *bsargs);
 	int get_encoder(FILE *fp,
 		char *format, char *codec, char *bsfilter, char *bsargs);
-	int read_options(const char *options, AVDictionary *&opts);
+	int read_options(const char *options, AVDictionary *&opts, int skip=0);
 	int scan_options(const char *options, AVDictionary *&opts, AVStream *st);
 	int read_options(FILE *fp, const char *options, AVDictionary *&opts);
 	int load_options(const char *options, AVDictionary *&opts);