diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:03:44 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:03:44 +0200 |
| commit | 7f6b794da051ff4e4235bbc2b84469ff2807a453 (patch) | |
| tree | 84557872394fe73f88b2628b6c268c1db573a43f | |
| parent | 4eb86b83a407faef20e9b243f341daa4e88728ef (diff) | |
| parent | 069713aa4b137781e270768d803b1f7456daa724 (diff) | |
| download | ffmpeg-7f6b794da051ff4e4235bbc2b84469ff2807a453.tar.gz | |
Merge commit '069713aa4b137781e270768d803b1f7456daa724'
* commit '069713aa4b137781e270768d803b1f7456daa724':
lavc: Drop deprecated thread opaque and codec pkt
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/avcodec.h | 16 | ||||
| -rw-r--r-- | libavcodec/version.h | 6 |
2 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ba50bff31f..8201536659 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2969,14 +2969,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 comparison function * - encoding: Set by user. @@ -3122,14 +3114,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 6109946a3f..0dced6cb62 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -106,12 +106,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 |