mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
hevcdec: remove redundant bits_used_for_short_term_rps field
It was introduced for Vulkan, but it is equivalent to short_term_ref_pic_set_size when !short_term_ref_pic_set_sps_flag, and when !!short_term_ref_pic_set_sps_flag, Vulkan hardcodes a zero anyway.
This commit is contained in:
parent
d8c7fea8ef
commit
697382168d
@ -723,7 +723,6 @@ static int hls_slice_header(HEVCContext *s)
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
sh->bits_used_for_short_term_rps = pos - get_bits_left(gb);
|
||||
sh->short_term_rps = &sh->slice_rps;
|
||||
} else {
|
||||
int numbits, rps_idx;
|
||||
|
@ -268,7 +268,6 @@ typedef struct SliceHeader {
|
||||
|
||||
///< RPS coded in the slice header itself is stored here
|
||||
int short_term_ref_pic_set_sps_flag;
|
||||
int bits_used_for_short_term_rps;
|
||||
int short_term_ref_pic_set_size;
|
||||
ShortTermRPS slice_rps;
|
||||
const ShortTermRPS *short_term_rps;
|
||||
|
@ -788,7 +788,7 @@ static int vk_hevc_start_frame(AVCodecContext *avctx,
|
||||
.NumDeltaPocsOfRefRpsIdx = h->sh.short_term_rps ? h->sh.short_term_rps->rps_idx_num_delta_pocs : 0,
|
||||
.PicOrderCntVal = h->poc,
|
||||
.NumBitsForSTRefPicSetInSlice = !h->sh.short_term_ref_pic_set_sps_flag ?
|
||||
h->sh.bits_used_for_short_term_rps : 0,
|
||||
h->sh.short_term_ref_pic_set_size : 0,
|
||||
};
|
||||
|
||||
/* Fill in references */
|
||||
|
Loading…
Reference in New Issue
Block a user