Credit Andrew - minor bug fixes and plugin update

diff --git a/cinelerra-5.1/cinelerra/bdwrite.C b/cinelerra-5.1/cinelerra/bdwrite.C
index 1017c1690670046fa831d603a73474085601f2b2..54b6ad216fd15674ef0a5f6cff6777dcdd72e0cd 100644 (file)
--- a/cinelerra-5.1/cinelerra/bdwrite.C
+++ b/cinelerra-5.1/cinelerra/bdwrite.C
@@ -2575,6 +2575,22 @@ static int field_probe(AVFormatContext *fmt_ctx, AVStream *st)
   av_packet_unref(&ipkt);
   av_frame_free(&ipic);
   avcodec_free_context(&ctx);
+  
+  if (ilaced < 0) {
+  fprintf(stderr, "warning bdwrite uses field into from stream \n", st->codecpar->field_order);
+  switch(st->codecpar->field_order) {
+  case AV_FIELD_TT:
+  case AV_FIELD_TB:   
+  case AV_FIELD_BB:    
+  case AV_FIELD_BT:      
+     return 1;
+  case AV_FIELD_PROGRESSIVE:   
+    return 0;
+  default:
+   return -1;
+   }
+  }
+  
   return ilaced;
 }
 

diff --git a/cinelerra-5.1/cinelerra/cache.C b/cinelerra-5.1/cinelerra/cache.C
index a93f1e1b994f7d800ad08d61e8e3deeff11f74c7..7c640d9e76da927bbf44c1df2efe83e222e75d57 100644 (file)
--- a/cinelerra-5.1/cinelerra/cache.C
+++ b/cinelerra-5.1/cinelerra/cache.C
@@ -117,11 +117,14 @@ File* CICache::check_out(Asset *asset, EDL *edl, int block)
 
 // cache deleted during checkout, destroy this
        if( users == 1 ) {
-               remove_user();
+               current->Garbage::remove_user();
+               total_lock->unlock();
                return 0;
        }
 
-       remove_user();
+       //printf("users: %i \n", users );
+       
+       current->Garbage::remove_user();
        total_lock->unlock();
 //printf("check out %p %lx %s\n", current, tid, asset->path);
        return current ? current->file : 0;

diff --git a/cinelerra-5.1/ffmpeg/plugin.opts b/cinelerra-5.1/ffmpeg/plugin.opts
index 195e7da75d72f565ef819afd300f8ec86ae886c9..b567e78f08571fa3d31d730004a5713fa3f54137 100644 (file)
--- a/cinelerra-5.1/ffmpeg/plugin.opts
+++ b/cinelerra-5.1/ffmpeg/plugin.opts
@@ -472,3 +472,8 @@ virtualbass
 #dialoguenhance ###Invalid argument
 #feedback ###Input/output error
 #multiply ###Input/output error
+#overlay_opencl ###Input/output error
+#program_opencl ###Operation not permitted
+#remap_opencl ###Input/output error
+#xfade_opencl ###Input_output error
+#openclsrc ###invalid argument