aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-18 00:20:51 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-18 00:54:37 +0100
commitc8ea57664fe3ad611c9ecd234670544ddff7ca55 (patch)
tree450f7c061d34de7b8d28294d9224808851d79cd2 /libavcodec
parentef8f6464a55db730cab8c48a1a51fa4e6ca12107 (diff)
downloadffmpeg-c8ea57664fe3ad611c9ecd234670544ddff7ca55.tar.gz
avcodec/h264_mc_template: prefetch list1 only if it is used in the MB
Fixes ubsan warning Fixes Mozilla bug 1230276 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_mc_template.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c
index eaead35bb2..e4333a733c 100644
--- a/libavcodec/h264_mc_template.c
+++ b/libavcodec/h264_mc_template.c
@@ -158,6 +158,7 @@ static void MCFUNC(hl_motion)(const H264Context *h, H264SliceContext *sl,
}
}
- prefetch_motion(h, sl, 1, PIXEL_SHIFT, CHROMA_IDC);
+ if (USES_LIST(mb_type, 1))
+ prefetch_motion(h, sl, 1, PIXEL_SHIFT, CHROMA_IDC);
}