diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 18:00:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 18:00:42 +0200 |
| commit | b0fdc76600a17a39b18deb7a1754246a973f3a98 (patch) | |
| tree | 60bb91d079843904d38b5e7df8786a8cde37eeb0 /libavcodec/dv.h | |
| parent | c2b1225c16f14a23a89c3eedbae51e6bc5667bc8 (diff) | |
| parent | 650dee63c8b1e6693c6cf5983f4a5ed3f571379f (diff) | |
| download | ffmpeg-b0fdc76600a17a39b18deb7a1754246a973f3a98.tar.gz | |
Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'
* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
dv: get rid of global non-const tables
Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv.h')
| -rw-r--r-- | libavcodec/dv.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/dv.h b/libavcodec/dv.h index 73ceb7fe09..63530109dc 100644 --- a/libavcodec/dv.h +++ b/libavcodec/dv.h @@ -32,6 +32,11 @@ #include "get_bits.h" #include "dv_profile.h" +typedef struct DVwork_chunk { + uint16_t buf_offset; + uint16_t mb_coordinates[5]; +} DVwork_chunk; + typedef struct DVVideoContext { const DVprofile *sys; AVFrame *frame; @@ -44,6 +49,8 @@ typedef struct DVVideoContext { void (*fdct[2])(int16_t *block); void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block); me_cmp_func ildct_cmp; + DVwork_chunk work_chunks[4 * 12 * 27]; + uint32_t idct_factor[2 * 4 * 16 * 64]; } DVVideoContext; enum dv_section_type { @@ -88,7 +95,7 @@ enum dv_pack_type { extern RL_VLC_ELEM ff_dv_rl_vlc[1184]; -int ff_dv_init_dynamic_tables(const DVprofile *d); +int ff_dv_init_dynamic_tables(DVVideoContext *s, const DVprofile *d); int ff_dvvideo_init(AVCodecContext *avctx); static inline int dv_work_pool_size(const DVprofile *d) |