diff options
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 396d399ef9..a8acae326a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -17,7 +17,7 @@ extern "C" { #define FFMPEG_VERSION_INT 0x000408 #define FFMPEG_VERSION "0.4.8" -#define LIBAVCODEC_BUILD 4708 +#define LIBAVCODEC_BUILD 4709 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION FFMPEG_VERSION @@ -442,7 +442,7 @@ typedef struct AVPanScan{ \ /**\ * Motion vector table\ - * - encoding: unused\ + * - encoding: set by user\ * - decoding: set by lavc\ */\ int16_t (*motion_val[2])[2];\ @@ -450,7 +450,7 @@ typedef struct AVPanScan{ /**\ * Macroblock type table\ * mb_type_base + mb_width + 2\ - * - encoding: unused\ + * - encoding: set by user\ * - decoding: set by lavc\ */\ uint32_t *mb_type;\ @@ -538,13 +538,20 @@ typedef struct AVPanScan{ * - decoding: set by lavc\ */\ short *dct_coeff;\ +\ + /**\ + * Motion referece frame index\ + * - encoding: set by user\ + * - decoding: set by lavc\ + */\ + int8_t *ref_index[2]; #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 #define FF_BUFFER_TYPE_INTERNAL 1 #define FF_BUFFER_TYPE_USER 2 ///< Direct rendering buffers (image is (de)allocated by user) -#define FF_BUFFER_TYPE_SHARED 4 ///< buffer from somewher else, dont dealloc image (data/base) +#define FF_BUFFER_TYPE_SHARED 4 ///< buffer from somewher else, dont dealloc image (data/base), all other tables are not shared #define FF_BUFFER_TYPE_COPY 8 ///< just a (modified) copy of some other buffer, dont dealloc anything @@ -1561,6 +1568,14 @@ typedef struct AVCodecContext { * - decoding: set by execute() */ void *thread_opaque; + + /** + * Motion estimation threshold. + * + * - encoding: set by user + * - decoding: set by user + */ + void *me_threshold; } AVCodecContext; |