RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5' 

* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-03 13:15:33 +02:00
parent 33f6ba9c4e df949b645b
commit 982920cfaa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/hevc.c
View File

@ -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) static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size)
{ {
//TODO: non-4:2:0 support //TODO: non-4:2:0 support
HEVCLocalContext *lc = s->HEVClc;
GetBitContext gb; GetBitContext gb;
int cb_size = 1 << log2_cb_size; int cb_size = 1 << log2_cb_size;
int stride0 = s->frame->linesize[0]; 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)]; 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; 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; int ret;
if (!s->sh.disable_deblocking_filter_flag) if (!s->sh.disable_deblocking_filter_flag)