diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 19:03:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 19:12:38 +0100 |
| commit | fd4e17fcc2b6f693f86b5620d1a0d1fa91239085 (patch) | |
| tree | ed48e3c84350089df77e490b72946326e727e58b /libavcodec/mpegvideo_motion.c | |
| parent | c756b3fca240df75ffa28e75f2eb34834c10294d (diff) | |
| download | ffmpeg-fd4e17fcc2b6f693f86b5620d1a0d1fa91239085.tar.gz | |
avcodec/mpegvideo_motion: Fix undefined shifts in mpeg_motion_internal()
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_motion.c')
| -rw-r--r-- | libavcodec/mpegvideo_motion.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 8180cf37c5..4fea847ef9 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -316,24 +316,26 @@ void mpeg_motion_internal(MpegEncContext *s, src_y); return; } + src_y = (unsigned)src_y << field_based; s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, s->linesize, 17, 17 + field_based, - src_x, src_y << field_based, + src_x, src_y, s->h_edge_pos, s->v_edge_pos); ptr_y = s->edge_emu_buffer; if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) { uint8_t *ubuf = s->edge_emu_buffer + 18 * s->linesize; uint8_t *vbuf = ubuf + 9 * s->uvlinesize; + uvsrc_y = (unsigned)uvsrc_y << field_based; s->vdsp.emulated_edge_mc(ubuf, ptr_cb, s->uvlinesize, s->uvlinesize, 9, 9 + field_based, - uvsrc_x, uvsrc_y << field_based, + uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); s->vdsp.emulated_edge_mc(vbuf, ptr_cr, s->uvlinesize, s->uvlinesize, 9, 9 + field_based, - uvsrc_x, uvsrc_y << field_based, + uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); ptr_cb = ubuf; ptr_cr = vbuf; |