fix mask vframe setup, add unshared vframe constructor

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filethread.C

diff --git a/cinelerra-5.1/cinelerra/filethread.C b/cinelerra-5.1/cinelerra/filethread.C
index c5b28785c03cd7f491adb61c1f5fb59d56a58b52..338176e6d86932116178431fe3aab071863fb528 100644 (file)
--- a/cinelerra-5.1/cinelerra/filethread.C
+++ b/cinelerra-5.1/cinelerra/filethread.C
@@ -214,12 +214,9 @@ void FileThread::run()
 //printf("FileThread::run %d\n", __LINE__);
                                if(!local_frame->frame)
                                {
 //printf("FileThread::run %d\n", __LINE__);
                                if(!local_frame->frame)
                                {

-                                       local_frame->frame = new VFrame(0,
-                                               -1,
-                                               file->asset->width,
-                                               file->asset->height,
-                                               supported_colormodel,
-                                               -1);
+                                       local_frame->frame =
+                                               new VFrame(file->asset->width, file->asset->height,
+                                                       supported_colormodel, 0);

                                }
 
 // Read it
                                }
 
 // Read it


@@ -454,12 +451,8 @@ int FileThread::start_writing(long buffer_size,
                                        else
                                        {
                                                video_buffer[buffer][layer][frame] =
                                        else
                                        {
                                                video_buffer[buffer][layer][frame] =

-                                                       new VFrame(0,
-                                                               -1,
-                                                               file->asset->width,
-                                                               file->asset->height,
-                                                               color_model,
-                                                               -1);
+                                                       new VFrame( file->asset->width, file->asset->height,
+                                                               color_model, -1);

 // printf("FileThread::start_writing %d %d %d %d %p\n",
 // __LINE__,
 // buffer,
 // printf("FileThread::start_writing %d %d %d %d %p\n",
 // __LINE__,
 // buffer,