aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-20 02:46:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-20 02:46:06 +0100
commitdbb38bc389e1af5ed465ed370887d6af4da0cb40 (patch)
tree8998bdad7433fa92d6008ebb8a096e9dd1460340 /libavcodec/avcodec.h
parent90c02ae1429b7f50cefdaeeca04b51f978cd1921 (diff)
parent09d243ddd0d939e97f3fe0b7f27320763ee41493 (diff)
downloadffmpeg-dbb38bc389e1af5ed465ed370887d6af4da0cb40.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: swscale: Fix stack alignment for SSE avcodec: move some AVCodecContext fields to an internal struct. avcodec: use av_opt_set() instead of deprecated av_set_string3() avcodec: fix some const warnings avcodec: remove pointless AVOption, internal_buffer_count imgutils: Fix illegal read. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h24
1 files changed, 21 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 41faaa28e0..dfd396c180 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1214,6 +1214,8 @@ typedef struct AVFrame {
} AVFrame;
+struct AVCodecInternal;
+
/**
* main external API structure.
* New fields can be added to the end with minor version bumps.
@@ -2041,17 +2043,21 @@ typedef struct AVCodecContext {
*/
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
*/
- int internal_buffer_count;
+ 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
*/
- void *internal_buffer;
+ attribute_deprecated void *internal_buffer;
+#endif
/**
* Global quality for codecs which cannot change it per frame.
@@ -2937,14 +2943,18 @@ typedef struct AVCodecContext {
*/
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
*/
- int is_copy;
+ attribute_deprecated int is_copy;
+#endif
/**
* Which multithreading methods to use.
@@ -3014,6 +3024,14 @@ typedef struct AVCodecContext {
#define AV_EF_AGGRESSIVE (1<<18)
/**
+ * Private context used for internal data.
+ *
+ * Unlike priv_data, this is not codec-specific. It is used in general
+ * libavcodec functions.
+ */
+ struct AVCodecInternal *internal;
+
+ /**
* Current statistics for PTS correction.
* - decoding: maintained and used by libavcodec, not intended to be used by user apps
* - encoding: unused