Another shuffle to try and shut down demuxers cleanly

Author: scriptorian

package.json

@@ -1,6 +1,6 @@
 {
   "name": "beamcoder",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "Node.js native bindings to FFmpeg.",
   "main": "index.js",
   "types": "index.d.ts",

src/format.cc

@@ -3826,38 +3826,41 @@ void formatContextFinalizer(napi_env env, void* data, void* hint) {
   AVFormatContext* fc = (AVFormatContext*) data;
   Adaptor *adaptor = (Adaptor *)hint;
   int ret;
-  if (fc->pb != nullptr) {
-    if (adaptor)
-      avio_context_free(&fc->pb);
-    else {
-      ret = avio_closep(&fc->pb);
-      if (ret < 0) {
-        printf("DEBUG: For url '%s', %s", (fc->url != nullptr) ? fc->url : "unknown",
-          avErrorMsg("error closing IO: ", ret));
-      }
-    }
-  }
-  // FIXME this is segfaulting ... why
-  /* if (fc->codec_whitelist != nullptr) {
-    av_freep(fc->codec_whitelist);
-  }
-  if (fc->format_whitelist != nullptr) {
-    av_freep(fc->format_whitelist);
-  }
-  if (fc->protocol_whitelist != nullptr) {
-    av_freep(fc->protocol_whitelist);
-  }
-  if (fc->protocol_blacklist != nullptr) {
-    av_freep(fc->protocol_blacklist);
-  } */
+
   if (fc->iformat != nullptr) {
-    // The format context we get here is copy so the close_input call won't clear the JS format context
+    // The format context we get here is a copy so the close_input call won't clear the JS format context
     // Hence copy the formatContext pointer to null the iformat after close to avoid a double delete
     AVFormatContext* closeFc = fc;
     avformat_close_input(&closeFc);
     fc->iformat = nullptr;
-  } else if (fc->oformat != nullptr && !adaptor) // crashes otherwise...
-    avformat_free_context(fc);
+  } else if (fc->oformat != nullptr) {
+    if (fc->pb != nullptr) {
+      if (adaptor)
+        avio_context_free(&fc->pb);
+      else {
+        ret = avio_closep(&fc->pb);
+        if (ret < 0) {
+          printf("DEBUG: For url '%s', %s", (fc->url != nullptr) ? fc->url : "unknown",
+            avErrorMsg("error closing IO: ", ret));
+        }
+      }
+    }
+    // FIXME this is segfaulting ... why
+    /* if (fc->codec_whitelist != nullptr) {
+      av_freep(fc->codec_whitelist);
+    }
+    if (fc->format_whitelist != nullptr) {
+      av_freep(fc->format_whitelist);
+    }
+    if (fc->protocol_whitelist != nullptr) {
+      av_freep(fc->protocol_whitelist);
+    }
+    if (fc->protocol_blacklist != nullptr) {
+      av_freep(fc->protocol_blacklist);
+    } */
+    if (!adaptor) // crashes otherwise...
+      avformat_free_context(fc);
+  }
 }
 
 napi_value newStream(napi_env env, napi_callback_info info) {