Merge commit '069713aa4b137781e270768d803b1f7456daa724'

* commit '069713aa4b137781e270768d803b1f7456daa724':
  lavc: Drop deprecated thread opaque and codec pkt

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/avcodec.h
index ba50bff31f06b6e311568718a1312dadb7198621,8eca49b654d6dc0eda9733b9c3950798da23786f..8201536659966750401ca74721e4de07f4742ba4
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -2969,16 -2714,8 +2969,8 @@@ 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
 +     * noise vs. sse weight for the nsse comparison function
       * - encoding: Set by user.
       * - decoding: unused
       */

diff --cc libavcodec/version.h
Simple merge