summaryrefslogtreecommitdiff
path: root/libavcodec/hevc_mvs.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-07 12:10:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-07 12:21:43 +0200
commit018ca8b7f6a8ff19edd7a79e01bea091dbc56fa9 (patch)
treec5295cf043e6ff139a0c1445218a420882c171b9 /libavcodec/hevc_mvs.c
parent0026c4ecfd7b122eb6d296e081747887676449f9 (diff)
parent79a60c8e779242b5ba4c531b2c706c871e8e6420 (diff)
Merge commit '79a60c8e779242b5ba4c531b2c706c871e8e6420'
* commit '79a60c8e779242b5ba4c531b2c706c871e8e6420': 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;