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_profile.h | |
| parent | c2b1225c16f14a23a89c3eedbae51e6bc5667bc8 (diff) | |
| parent | 650dee63c8b1e6693c6cf5983f4a5ed3f571379f (diff) | |
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_profile.h')
| -rw-r--r-- | libavcodec/dv_profile.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/dv_profile.h b/libavcodec/dv_profile.h index 8f0faf315b..b94cd2a84c 100644 --- a/libavcodec/dv_profile.h +++ b/libavcodec/dv_profile.h @@ -29,11 +29,6 @@ determine the profile */ #define DV_PROFILE_BYTES (6*80) /* 6 DIF blocks */ -typedef struct DVwork_chunk { - uint16_t buf_offset; - uint16_t mb_coordinates[5]; -} DVwork_chunk; - /* * DVprofile is used to express the differences between various * DV flavors. For now it's primarily used for differentiating @@ -51,8 +46,6 @@ typedef struct DVprofile { int height; /* picture height in pixels */ int width; /* picture width in pixels */ AVRational sar[2]; /* sample aspect ratios for 4:3 and 16:9 */ - DVwork_chunk *work_chunks; /* each thread gets its own chunk of frame to work on */ - uint32_t *idct_factor; /* set of iDCT factor tables */ enum AVPixelFormat pix_fmt; /* picture pixel format */ int bpm; /* blocks per macroblock */ const uint8_t *block_sizes; /* AC block sizes, in bits */ |