aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hevc_mvs.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-01 13:05:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-01 13:05:46 +0100
commit13ecdb06f8503c852546b017e7e861e10d9f416f (patch)
tree51adceb5d1b9b106f5c41435331c2bc051c2e105 /libavcodec/hevc_mvs.c
parentd61454e7c1de48f6a9059ca98f55e6beb52a618c (diff)
parentde31f857077a52714f3a2f2e92ac037d42d37769 (diff)
downloadffmpeg-13ecdb06f8503c852546b017e7e861e10d9f416f.tar.gz
Merge commit 'de31f857077a52714f3a2f2e92ac037d42d37769' into release/2.4
* commit 'de31f857077a52714f3a2f2e92ac037d42d37769': hevc_mvs: initialize the temporal MV in case of missing ref Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
-rw-r--r--libavcodec/hevc_mvs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index e2b592c872..26c7c10b57 100644
--- a/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@ -227,8 +227,10 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0,
HEVCFrame *ref = s->ref->collocated_ref;
- if (!ref)
+ if (!ref) {
+ memset(mvLXCol, 0, sizeof(*mvLXCol));
return 0;
+ }
tab_mvf = ref->tab_mvf;
colPic = ref->poc;