diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-18 00:20:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-20 03:24:22 +0100 |
| commit | 50ce06cc7c5aa37ddab9147c13b22aaff959a43a (patch) | |
| tree | 692349913c69adfd2dcf024b85308babb81c0e6c | |
| parent | a628b7083100f96e376d97e5afb12efb74f01e8a (diff) | |
| download | ffmpeg-50ce06cc7c5aa37ddab9147c13b22aaff959a43a.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>
(cherry picked from commit c8ea57664fe3ad611c9ecd234670544ddff7ca55)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h264_mc_template.c | 3 |
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); } |