diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 13:15:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 13:19:34 +0200 |
| commit | 982920cfaa40d5b575225fc2baaf03f6250f7a03 (patch) | |
| tree | 98ce06e3942a271229166bbdad85278219bc15d2 /libavcodec/hevc.c | |
| parent | 33f6ba9c4e7bc5b2f06972f7e38dd35b31756dc9 (diff) | |
| parent | df949b645b12d62bb4da56d629a887c81f67f2e5 (diff) | |
| download | ffmpeg-982920cfaa40d5b575225fc2baaf03f6250f7a03.tar.gz | |
Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'
* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
hevc: Use the local context variable when needed
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 99d8a632a8..8d951b0e67 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1048,6 +1048,7 @@ static int hls_transform_tree(HEVCContext *s, int x0, int y0, static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size) { //TODO: non-4:2:0 support + HEVCLocalContext *lc = s->HEVClc; GetBitContext gb; int cb_size = 1 << log2_cb_size; int stride0 = s->frame->linesize[0]; @@ -1058,7 +1059,7 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size) uint8_t *dst2 = &s->frame->data[2][(y0 >> s->sps->vshift[2]) * stride2 + ((x0 >> s->sps->hshift[2]) << s->sps->pixel_shift)]; int length = cb_size * cb_size * s->sps->pcm.bit_depth + ((cb_size * cb_size) >> 1) * s->sps->pcm.bit_depth_chroma; - const uint8_t *pcm = skip_bytes(&s->HEVClc->cc, (length + 7) >> 3); + const uint8_t *pcm = skip_bytes(&lc->cc, (length + 7) >> 3); int ret; if (!s->sh.disable_deblocking_filter_flag) |