[FFmpeg-cvslog] lavc: Drop deprecated thread opaque and codec pkt
Vittorio Giovara
git at videolan.org
Sat Sep 5 17:04:07 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Jul 28 14:30:25 2015 +0100| [069713aa4b137781e270768d803b1f7456daa724] | committer: Vittorio Giovara
lavc: Drop deprecated thread opaque and codec pkt
These fields were never part of the public API.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=069713aa4b137781e270768d803b1f7456daa724
---
libavcodec/avcodec.h | 16 ----------------
libavcodec/version.h | 6 ------
2 files changed, 22 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8390bda..8eca49b 100644
--- 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 2d26d4f..d14b1c0 100644
--- 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
More information about the ffmpeg-cvslog
mailing list