diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 02:46:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 02:46:06 +0100 |
commit | dbb38bc389e1af5ed465ed370887d6af4da0cb40 (patch) | |
tree | 8998bdad7433fa92d6008ebb8a096e9dd1460340 /libavcodec/internal.h | |
parent | 90c02ae1429b7f50cefdaeeca04b51f978cd1921 (diff) | |
parent | 09d243ddd0d939e97f3fe0b7f27320763ee41493 (diff) | |
download | ffmpeg-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/internal.h')
-rw-r--r-- | libavcodec/internal.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 375c567459..694d344da1 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -25,8 +25,42 @@ #define AVCODEC_INTERNAL_H #include <stdint.h> + +#include "libavutil/pixfmt.h" #include "avcodec.h" +typedef struct InternalBuffer { + int last_pic_num; + uint8_t *base[4]; + uint8_t *data[4]; + int linesize[4]; + int width; + int height; + enum PixelFormat pix_fmt; +} InternalBuffer; + +typedef struct AVCodecInternal { + /** + * internal buffer count + * used by default get/release/reget_buffer(). + */ + int buffer_count; + + /** + * internal buffers + * used by default get/release/reget_buffer(). + */ + InternalBuffer *buffer; + + /** + * Whether the parent AVCodecContext 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. + */ + int is_copy; +} AVCodecInternal; + struct AVCodecDefault { const uint8_t *key; const uint8_t *value; |