diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
| commit | f7813a5324be39d13ab536c245d15dfc602a7849 (patch) | |
| tree | fad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/ffv1.h | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/ffv1.h')
| -rw-r--r-- | ffmpeg/libavcodec/ffv1.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ffmpeg/libavcodec/ffv1.h b/ffmpeg/libavcodec/ffv1.h index 23633c9..9d8329f 100644 --- a/ffmpeg/libavcodec/ffv1.h +++ b/ffmpeg/libavcodec/ffv1.h @@ -41,6 +41,7 @@ #include "mathops.h" #include "put_bits.h" #include "rangecoder.h" +#include "thread.h" #ifdef __INTEL_COMPILER #undef av_flatten @@ -82,14 +83,15 @@ typedef struct FFV1Context { uint64_t rc_stat[256][2]; uint64_t (*rc_stat2[MAX_QUANT_TABLES])[32][2]; int version; - int minor_version; + int micro_version; int width, height; int chroma_planes; int chroma_h_shift, chroma_v_shift; int transparency; int flags; int picture_number; - AVFrame picture, last_picture; + ThreadFrame picture, last_picture; + struct FFV1Context *fsrc; AVFrame *cur; int plane_count; @@ -106,6 +108,7 @@ typedef struct FFV1Context { int16_t *sample_buffer; int ec; + int intra; int slice_damaged; int key_frame_ok; @@ -125,6 +128,10 @@ typedef struct FFV1Context { int slice_height; int slice_x; int slice_y; + int slice_reset_contexts; + int slice_coding_mode; + int slice_rct_by_coef; + int slice_rct_ry_coef; } FFV1Context; int ffv1_common_init(AVCodecContext *avctx); |
