X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilempeg.C;h=9988673fe1215cfe1d41a9f64f2a2d8990205509;hb=fbb844da24c44cce0509451116df248c861ef8f7;hp=8310942cb6ac158375c3a46d87193421277b343b;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C
index 8310942c..9988673f 100644
--- a/cinelerra-5.1/cinelerra/filempeg.C
+++ b/cinelerra-5.1/cinelerra/filempeg.C
@@ -105,10 +105,8 @@ FileMPEG::~FileMPEG()
 }
 
 void FileMPEG::get_parameters(BC_WindowBase *parent_window,
-	Asset *asset,
-	BC_WindowBase* &format_window,
-	int audio_options,
-	int video_options)
+	Asset *asset, BC_WindowBase* &format_window,
+	int audio_options, int video_options, EDL *edl)
 {
 	if(audio_options && asset->format == FILE_AMPEG)
 	{
@@ -786,7 +784,7 @@ int FileMPEG::toc_nail(void *vp, int track)
 	if( mpeg->get_video_info(track, pid, framerate, width, height) ) return 1;
 	if( pid < 0 || framerate <= 0 ) return 1;
 	double position = framenum / framerate;
-//printf("t%d/%03x f"_LD", %dx%d %dx%d\n",track,pid,framenum,mw,mh,width,height);
+//printf("t%d/%03x f%jd, %dx%d %dx%d\n",track,pid,framenum,mw,mh,width,height);
 	MWindow::commercials->get_frame(file, pid, position, tdat, mw, mh, width, height);
 	return 0;
 }
@@ -1325,12 +1323,8 @@ int FileMPEG::write_frames(VFrame ***frames, int len)
 
 						if(!temp_frame)
 						{
-							temp_frame = new VFrame(0,
-								-1,
-								temp_w,
-								temp_h,
-								output_cmodel,
-								-1);
+							temp_frame = new VFrame(temp_w, temp_h,
+									output_cmodel, 0);
 						}
 
 						BC_CModels::transfer(temp_frame->get_rows(),
@@ -1376,12 +1370,8 @@ int FileMPEG::write_frames(VFrame ***frames, int len)
 //printf("FileMPEG::write_frames %d\n", __LINE__);sleep(1);
 						if(!temp_frame)
 						{
-							temp_frame = new VFrame(0,
-								-1,
-								asset->width,
-								asset->height,
-								output_cmodel,
-								-1);
+							temp_frame = new VFrame(asset->width, asset->height,
+										output_cmodel, 0);
 						}
 
 // printf("FileMPEG::write_frames %d temp_frame=%p %p %p %p frame=%p %p %p %p color_model=%p %p\n",