virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f'

Browse Source 
* commit '4885bde3187a2bb0cae85b67796e07db233bf77f':
  motion_est_template: Fix undefined left shift of negative number

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-29 15:26:59 +02:00
commit fe294b3403
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/motion_est_template.c
View File

@ -702,7 +702,8 @@ 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;