package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 09:06:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[h265e]: rename fivm_max_mrg_cnd to max_mrg_cnd

Browse Source 
Change-Id: I7e1b4fb37a8af9812c393e095006f4af9f625bea
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
This commit is contained in:
sayon.chen
2020-01-03 14:43:24 +08:00
committed by Herman Chen
parent 459eace205
commit 72606f13fa
7 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/rk_venc_cmd.h
View File

@@ -817,8 +817,6 @@ typedef struct MppEncH265CuCfg_t {
RK_U32 pcm_enabled_flag; /*default: 0, enable ipcm*/
RK_U32 pcm_loop_filter_disabled_flag;
// inter pred
RK_U32 max_num_merge_cand;
} MppEncH265CuCfg;
typedef struct MppEncH265RefCfg_t {
@@ -846,7 +844,7 @@ typedef struct MppEncH265TransCfg_t {
} MppEncH265TransCfg;
typedef struct MppEncH265MergeCfg_t {
RK_U32 fivm_max_mrg_cnd;
RK_U32 max_mrg_cnd;
RK_U32 merge_up_flag;
RK_U32 merge_left_flag;
} MppEncH265MergesCfg;