diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 23:51:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 23:53:31 +0200 |
| commit | 226b290f9f73d691ef1423d5c105f0bb0577d588 (patch) | |
| tree | 4bb0565c17838981ae6ab1ca2c0b8d6a69c7d610 | |
| parent | 371cb96414bb77edaf0333ff818be88f0092a094 (diff) | |
| parent | 73bb8f61d48dbf7237df2e9cacd037f12b84b00a (diff) | |
| download | ffmpeg-226b290f9f73d691ef1423d5c105f0bb0577d588.tar.gz | |
Merge commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a'
* commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a':
hevcdsp: remove an unneeded variable in the loop filter
Conflicts:
libavcodec/hevc_filter.c
See: d7e162d46b4a0fc03ca5161cdcac840152f048cb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc_filter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 7b41dd47ed..ac50333d29 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -383,7 +383,8 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) if (bs0 || bs1) { const int qp = (get_qPy(s, x - 1, y) + get_qPy(s, x, y) + 1) >> 1; - beta = betatable[av_clip(qp + beta_offset, 0, MAX_QP)]; + beta = betatable[av_clip(qp + beta_offset, 0, MAX_QP)]; + tc[0] = bs0 ? TC_CALC(qp, bs0) : 0; tc[1] = bs1 ? TC_CALC(qp, bs1) : 0; src = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)]; @@ -450,7 +451,7 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) tc_offset = x >= x0 ? cur_tc_offset : left_tc_offset; beta_offset = x >= x0 ? cur_beta_offset : left_beta_offset; - beta = betatable[av_clip(qp + beta_offset, 0, MAX_QP)]; + beta = betatable[av_clip(qp + beta_offset, 0, MAX_QP)]; tc[0] = bs0 ? TC_CALC(qp, bs0) : 0; tc[1] = bs1 ? TC_CALC(qp, bs1) : 0; src = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)]; |