diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 22:51:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 22:51:49 +0100 |
| commit | b73cf4eb1561838c324eb3862a71ae3cdc0f6899 (patch) | |
| tree | 4db94943fcf0b9c3efaba7d3376b497f49740579 /libavformat/hevc.c | |
| parent | d79d5aed6d43893ae5d7c088c3ce3aea6e7c4079 (diff) | |
| parent | ee17be3fdd37f63f4b77676820e387858908b0f4 (diff) | |
| download | ffmpeg-b73cf4eb1561838c324eb3862a71ae3cdc0f6899.tar.gz | |
Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'
* commit 'ee17be3fdd37f63f4b77676820e387858908b0f4':
hevc: Use get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hevc.c')
| -rw-r--r-- | libavformat/hevc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/hevc.c b/libavformat/hevc.c index 19dd2f40cf..09d1355573 100644 --- a/libavformat/hevc.c +++ b/libavformat/hevc.c @@ -402,10 +402,10 @@ static void skip_scaling_list_data(GetBitContext *gb) num_coeffs = FFMIN(64, 1 << (4 + (i << 1))); if (i > 1) - get_se_golomb(gb); // scaling_list_dc_coef_minus8[i-2][j] + get_se_golomb_long(gb); // scaling_list_dc_coef_minus8[i-2][j] for (k = 0; k < num_coeffs; k++) - get_se_golomb(gb); // scaling_list_delta_coef + get_se_golomb_long(gb); // scaling_list_delta_coef } } @@ -593,7 +593,7 @@ static int hvcc_parse_pps(GetBitContext *gb, get_ue_golomb_long(gb); // num_ref_idx_l0_default_active_minus1 get_ue_golomb_long(gb); // num_ref_idx_l1_default_active_minus1 - get_se_golomb (gb); // init_qp_minus26 + get_se_golomb_long(gb); // init_qp_minus26 /* * constrained_intra_pred_flag u(1) @@ -604,8 +604,8 @@ static int hvcc_parse_pps(GetBitContext *gb, if (get_bits1(gb)) // cu_qp_delta_enabled_flag get_ue_golomb_long(gb); // diff_cu_qp_delta_depth - get_se_golomb(gb); // pps_cb_qp_offset - get_se_golomb(gb); // pps_cr_qp_offset + get_se_golomb_long(gb); // pps_cb_qp_offset + get_se_golomb_long(gb); // pps_cr_qp_offset /* * weighted_pred_flag u(1) |