diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:46:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:57:41 +0100 |
| commit | 4dd85093f119ccaffb391f96e7c3598a2849f151 (patch) | |
| tree | 9b1768a11fd44a35fa8020bb0b633208a0f73852 /libavcodec/hevc_mvs.c | |
| parent | db6be5416caf32ac85c3f9546e86ef9db06a7e2a (diff) | |
| parent | 9e9be5a20c0b36dce1cae11f5f5957886231a764 (diff) | |
Merge commit '9e9be5a20c0b36dce1cae11f5f5957886231a764'
* commit '9e9be5a20c0b36dce1cae11f5f5957886231a764':
hevc_mvs: prevent unitialized use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
| -rw-r--r-- | libavcodec/hevc_mvs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 826d084662..318e7a2755 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -408,7 +408,7 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, // temporal motion vector candidate if (s->sh.slice_temporal_mvp_enabled_flag && nb_merge_cand < s->sh.max_num_merge_cand) { - Mv mv_l0_col, mv_l1_col; + Mv mv_l0_col = { 0 }, mv_l1_col = { 0 }; int available_l0 = temporal_luma_motion_vector(s, x0, y0, nPbW, nPbH, 0, &mv_l0_col, 0); int available_l1 = (s->sh.slice_type == B_SLICE) ? |