ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanaga...@gmail.com> | Sat Sep 19 13:18:16 2015 -0400| [11b563ed8f7c1a9183ba77680d9040fc384733d5] | committer: Michael Niedermayer
avcodec/motion_est_template: fix undefined left shift of negative number This fixes -Wshift-negative-value reported with clang 3.7+, e.g http://fate.ffmpeg.org/log.cgi?time=20150918181527&log=compile&slot=x86_64-darwin-clang-polly-vectorize-stripmine-3.7. Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11b563ed8f7c1a9183ba77680d9040fc384733d5 --- libavcodec/motion_est_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 25bab9d..2141771 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -702,7 +702,7 @@ static int sab_diamond_search(MpegEncContext * s, int *best, int dmin, key += (1<<(ME_MAP_MV_BITS-1)) + (1<<(2*ME_MAP_MV_BITS-1)); - if((key&((-1)<<(2*ME_MAP_MV_BITS))) != map_generation) continue; + if((key&(-(1<<(2*ME_MAP_MV_BITS)))) != map_generation) continue; minima[j].height= score_map[i]; minima[j].x= key & ((1<<ME_MAP_MV_BITS)-1); key>>=ME_MAP_MV_BITS; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
