mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'
* commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b': hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
953d55f443
@ -482,7 +482,7 @@ void ff_hevc_luma_mv_merge_mode(HEVCContext *s, int x0, int y0, int nPbW,
|
|||||||
{
|
{
|
||||||
int singleMCLFlag = 0;
|
int singleMCLFlag = 0;
|
||||||
int nCS = 1 << log2_cb_size;
|
int nCS = 1 << log2_cb_size;
|
||||||
LOCAL_ALIGNED(4, MvField, mergecand_list, [MRG_MAX_NUM_CANDS]);
|
MvField mergecand_list[MRG_MAX_NUM_CANDS];
|
||||||
int nPbW2 = nPbW;
|
int nPbW2 = nPbW;
|
||||||
int nPbH2 = nPbH;
|
int nPbH2 = nPbH;
|
||||||
HEVCLocalContext *lc = s->HEVClc;
|
HEVCLocalContext *lc = s->HEVClc;
|
||||||
|
Loading…
Reference in New Issue
Block a user