avcodec/avcodec: Store whether AVCodec->close needs to be called

Right now all AVCodecContexts except those using frame-threaded decoding
call the codec's init function and expect its close function to be
called. In order to make sure that the close function is not called for
frame-threaded decoding ff_frame_thread_free() resets
AVCodecContext.codec (and because of this it has to free the private
AVOptions of the main AVCodecContext itself). This is not obvious and
potentially fragile. Instead add a field to AVCodecInternal that
indicates whether close should be called for this AVCodecContext.
It is always zero when using frame-threaded decoding, so that resetting
the codec is no longer necessary and has been removed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index b101f20c40..60f65d3f2c 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -161,6 +161,12 @@ typedef struct AVCodecInternal {
     EncodeSimpleContext es;
 
     /**
+     * If this is set, then AVCodec->close (if existing) needs to be called
+     * for the parent AVCodecContext.
+     */
+    int needs_close;
+
+    /**
      * Number of audio samples to skip at the start of the next decoded frame
      */
     int skip_samples;