mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-28 04:06:12 +02:00
Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'
* commit '16c01fb4347312b6d29a6498dad627665b96a20e': hevc: remove an unused function parameter Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
c192be1968
@ -865,8 +865,7 @@ static int hls_cross_component_pred(HEVCContext *s, int idx) {
|
|||||||
static int hls_transform_unit(HEVCContext *s, int x0, int y0,
|
static int hls_transform_unit(HEVCContext *s, int x0, int y0,
|
||||||
int xBase, int yBase, int cb_xBase, int cb_yBase,
|
int xBase, int yBase, int cb_xBase, int cb_yBase,
|
||||||
int log2_cb_size, int log2_trafo_size,
|
int log2_cb_size, int log2_trafo_size,
|
||||||
int trafo_depth, int blk_idx,
|
int blk_idx, int cbf_luma, int *cbf_cb, int *cbf_cr)
|
||||||
int cbf_luma, int *cbf_cb, int *cbf_cr)
|
|
||||||
{
|
{
|
||||||
HEVCLocalContext *lc = s->HEVClc;
|
HEVCLocalContext *lc = s->HEVClc;
|
||||||
const int log2_trafo_size_c = log2_trafo_size - s->sps->hshift[1];
|
const int log2_trafo_size_c = log2_trafo_size - s->sps->hshift[1];
|
||||||
@ -1183,7 +1182,7 @@ do {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ret = hls_transform_unit(s, x0, y0, xBase, yBase, cb_xBase, cb_yBase,
|
ret = hls_transform_unit(s, x0, y0, xBase, yBase, cb_xBase, cb_yBase,
|
||||||
log2_cb_size, log2_trafo_size, trafo_depth,
|
log2_cb_size, log2_trafo_size,
|
||||||
blk_idx, cbf_luma, cbf_cb, cbf_cr);
|
blk_idx, cbf_luma, cbf_cb, cbf_cr);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user