diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 16:12:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 16:12:41 +0400 |
| commit | ad8bf22086e2e4c62b69166456a7a3b08db7a2a5 (patch) | |
| tree | 7cb169627c6dbcaf26b80700c91363342312af3e /libavformat | |
| parent | 7f8804296da9f0511873c3c75a86ddf195cb0214 (diff) | |
| parent | b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa (diff) | |
Merge commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa' into release/2.2
* commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa':
hevc: Use get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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) |