lavc: Drop deprecated thread opaque and codec pkt

These fields were never part of the public API.

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8390bdaff6039bcba6cf028ca99da49106532ce2..8eca49b654d6dc0eda9733b9c3950798da23786f 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2714,14 +2714,6 @@ typedef struct AVCodecContext {
      */
     int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
-#if FF_API_THREAD_OPAQUE
-    /**
-     * @deprecated this field should not be used from outside of lavc
-     */
-    attribute_deprecated
-    void *thread_opaque;
-#endif
-
     /**
      * noise vs. sse weight for the nsse comparsion function
      * - encoding: Set by user.
@@ -2866,14 +2858,6 @@ typedef struct AVCodecContext {
     int error_rate;
 #endif
 
-#if FF_API_CODEC_PKT
-    /**
-     * @deprecated this field is not supposed to be accessed from outside lavc
-     */
-    attribute_deprecated
-    AVPacket *pkt;
-#endif
-
     /**
      * VBV delay coded in the last frame (in periods of a 27 MHz clock).
      * Used for compliant TS muxing.

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2d26d4f19e53e83f08b40f5dbca78098d35c58c6..d14b1c0e4db67357859a8b67fc724e72ef5ade37 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -81,12 +81,6 @@
 #ifndef FF_API_ASPECT_EXTENDED
 #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_THREAD_OPAQUE
-#define FF_API_THREAD_OPAQUE     (LIBAVCODEC_VERSION_MAJOR < 57)
-#endif
-#ifndef FF_API_CODEC_PKT
-#define FF_API_CODEC_PKT         (LIBAVCODEC_VERSION_MAJOR < 57)
-#endif
 #ifndef FF_API_ARCH_ALPHA
 #define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 57)
 #endif