diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | b063582e0c4f775a8ba377488bd085595e0e7fae (patch) | |
| tree | 2ea6b975d859df7d1357d79b1d29d67c5d7efbf4 /libavcodec/h264.h | |
| parent | 95eb35f30513e335990ad0d5dca6ddc318477291 (diff) | |
| download | ffmpeg-b063582e0c4f775a8ba377488bd085595e0e7fae.tar.gz | |
h264: move intra_pcm_ptr into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 882aeb558f..83c99622bf 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -374,6 +374,7 @@ typedef struct H264SliceContext { * according to picture reordering in slice header */ int ref2frm[MAX_SLICES][2][64]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1 + const uint8_t *intra_pcm_ptr; /** * non zero coeff count cache. @@ -468,7 +469,6 @@ typedef struct H264Context { GetBitContext *intra_gb_ptr; GetBitContext *inter_gb_ptr; - const uint8_t *intra_pcm_ptr; DECLARE_ALIGNED(16, int16_t, mb)[16 * 48 * 2]; ///< as a dct coeffecient is int32_t in high depth, we need to reserve twice the space. DECLARE_ALIGNED(16, int16_t, mb_luma_dc)[3][16 * 2]; int16_t mb_padding[256 * 2]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either check that i is not too large or ensure that there is some unused stuff after mb |