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

lavc/vaapi_encode_h265: Remove duplicate slice_segment_address. 

the VAEncSliceParameterBufferHEVC in libva have support this field,
so remove the duplicate field in VAAPIEncodeH265MiscSliceParams.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Jun Zhao 2017-07-18 00:01:09 -04:00 committed by Mark Thompson
parent c61715e2c5
commit 5b8a708492
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vaapi_encode_h265.c
View File

@ -149,7 +149,6 @@ typedef struct VAAPIEncodeH265MiscSequenceParams {
typedef struct VAAPIEncodeH265MiscSliceParams { typedef struct VAAPIEncodeH265MiscSliceParams {
// Slice segments. // Slice segments.
char first_slice_segment_in_pic_flag; char first_slice_segment_in_pic_flag;
unsigned int slice_segment_address;
// Short-term reference picture sets. // Short-term reference picture sets.
char short_term_ref_pic_set_sps_flag; char short_term_ref_pic_set_sps_flag;
@ -586,7 +585,7 @@ static void vaapi_encode_h265_write_slice_header2(PutBitContext *pbc,
if (vpic->pic_fields.bits.dependent_slice_segments_enabled_flag) if (vpic->pic_fields.bits.dependent_slice_segments_enabled_flag)
u(1, vslice_field(dependent_slice_segment_flag)); u(1, vslice_field(dependent_slice_segment_flag));
u(av_log2((priv->ctu_width * priv->ctu_height) - 1) + 1, u(av_log2((priv->ctu_width * priv->ctu_height) - 1) + 1,
mslice_var(slice_segment_address)); vslice_var(slice_segment_address));
} }
if (!vslice->slice_fields.bits.dependent_slice_segment_flag) { if (!vslice->slice_fields.bits.dependent_slice_segment_flag) {
for (i = 0; i < mseq->num_extra_slice_header_bits; i++) for (i = 0; i < mseq->num_extra_slice_header_bits; i++)