diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:30:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:30:41 +0100 |
| commit | c192be196839ae28a55b37a01209bc052b8fdbe3 (patch) | |
| tree | 6ceb892b04862b5e98ebf55454fcc369bc0bf206 /libavcodec/hevc.c | |
| parent | e7fdfbdc58bd5c9c30c612ae12b4f9fd8ad13d17 (diff) | |
| parent | 16c01fb4347312b6d29a6498dad627665b96a20e (diff) | |
| download | ffmpeg-c192be196839ae28a55b37a01209bc052b8fdbe3.tar.gz | |
Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'
* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
hevc: remove an unused function parameter
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index e1382b8e83..9551d3066f 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -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, int xBase, int yBase, int cb_xBase, int cb_yBase, int log2_cb_size, int log2_trafo_size, - int trafo_depth, int blk_idx, - int cbf_luma, int *cbf_cb, int *cbf_cr) + int blk_idx, int cbf_luma, int *cbf_cb, int *cbf_cr) { HEVCLocalContext *lc = s->HEVClc; 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, - log2_cb_size, log2_trafo_size, trafo_depth, + log2_cb_size, log2_trafo_size, blk_idx, cbf_luma, cbf_cb, cbf_cr); if (ret < 0) return ret; |