wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '069713aa4b'

Browse source 
* commit '069713aa4b':
  lavc: Drop deprecated thread opaque and codec pkt

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-05 17:03:44 +02:00
commit 7f6b794da0
2 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libavcodec/avcodec.h
View file

@ -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.

6
libavcodec/version.h
View file

@ -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