RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-07 23:32:33 +00:00
Code Issues Projects Releases Wiki Activity

lavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.

Browse Source
This commit is contained in:
Anton Khirnov 2012-01-22 10:56:42 +01:00
parent ac84395d6a
commit 370e923e0b
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/avcodec.h
View File

@ -2029,22 +2029,6 @@ typedef struct AVCodecContext {
*/ */
int color_table_id; int color_table_id;
#if FF_API_INTERNAL_CONTEXT
/**
* internal_buffer count
* Don't touch, used by libavcodec default_get_buffer().
* @deprecated this field was moved to an internal context
*/
attribute_deprecated int internal_buffer_count;
/**
* internal_buffers
* Don't touch, used by libavcodec default_get_buffer().
* @deprecated this field was moved to an internal context
*/
attribute_deprecated void *internal_buffer;
#endif
/** /**
* Global quality for codecs which cannot change it per frame. * Global quality for codecs which cannot change it per frame.
* This should be proportional to MPEG-1/2/4 qscale. * This should be proportional to MPEG-1/2/4 qscale.
@ -2709,19 +2693,6 @@ typedef struct AVCodecContext {
*/ */
AVPacket *pkt; AVPacket *pkt;
#if FF_API_INTERNAL_CONTEXT
/**
* Whether this is a copy of the context which had init() called on it.
* This is used by multithreading - shared tables and picture pointers
* should be freed from the original context only.
* - encoding: Set by libavcodec.
* - decoding: Set by libavcodec.
*
* @deprecated this field has been moved to an internal context
*/
attribute_deprecated int is_copy;
#endif
/** /**
* Which multithreading methods to use. * Which multithreading methods to use.
* Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread, * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,

3
libavcodec/version.h
View File

@ -41,9 +41,6 @@
#ifndef FF_API_REQUEST_CHANNELS #ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif
#ifndef FF_API_INTERNAL_CONTEXT
#define FF_API_INTERNAL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_TIFFENC_COMPLEVEL #ifndef FF_API_TIFFENC_COMPLEVEL
#define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54)
#endif #endif