diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 13:35:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 13:54:51 +0200 |
| commit | 4a73fa19ca7ac74f16422eabf731b86796b7d588 (patch) | |
| tree | fd210de29e3580c5787668a802dc4b7eb0028451 | |
| parent | 0a1ffc57882c467b6573b23f1d206aa87caf0025 (diff) | |
| parent | 4aa80808bcc2a30fcd7ce5b38594319df3a85b36 (diff) | |
| download | ffmpeg-4a73fa19ca7ac74f16422eabf731b86796b7d588.tar.gz | |
Merge commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36'
* commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36':
hevc: eliminate unnecessary cbf_c{b,r} arrays
Conflicts:
libavcodec/hevc.c
See: 77ef9fd1e938010600620c1d32cabd15e7d5b853
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index f8cf7831d4..c09de7a8e4 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -859,7 +859,8 @@ 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_cb, int *cbf_cr) + int trafo_depth, int blk_idx, + int *cbf_cb, int *cbf_cr) { HEVCLocalContext *lc = s->HEVClc; const int log2_trafo_size_c = log2_trafo_size - s->sps->hshift[1]; @@ -1081,7 +1082,8 @@ static void set_deblocking_bypass(HEVCContext *s, int x0, int y0, int log2_cb_si static int hls_transform_tree(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 *base_cbf_cb, int *base_cbf_cr) + int trafo_depth, int blk_idx, + int *base_cbf_cb, int *base_cbf_cr) { HEVCLocalContext *lc = s->HEVClc; uint8_t split_transform_flag; |