RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4' 

* commit 'ee17be3fdd37f63f4b77676820e387858908b0f4':
  hevc: Use get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-10 22:51:38 +01:00
parent d79d5aed6d ee17be3fdd
commit b73cf4eb15
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/hevc.c
View File

@ -402,10 +402,10 @@ static void skip_scaling_list_data(GetBitContext *gb)
num_coeffs = FFMIN(64, 1 << (4 + (i << 1))); num_coeffs = FFMIN(64, 1 << (4 + (i << 1)));
if (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++) 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_l0_default_active_minus1
get_ue_golomb_long(gb); // num_ref_idx_l1_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) * 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 if (get_bits1(gb)) // cu_qp_delta_enabled_flag
get_ue_golomb_long(gb); // diff_cu_qp_delta_depth get_ue_golomb_long(gb); // diff_cu_qp_delta_depth
get_se_golomb(gb); // pps_cb_qp_offset get_se_golomb_long(gb); // pps_cb_qp_offset
get_se_golomb(gb); // pps_cr_qp_offset get_se_golomb_long(gb); // pps_cr_qp_offset
/* /*
* weighted_pred_flag u(1) * weighted_pred_flag u(1)