diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 15:08:37 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 15:08:37 +0400 |
| commit | 10c6d1b28cbd0f39915649940821184d8278eaea (patch) | |
| tree | 6ac53e4fe6e0c23f72033ecfb2280895f653cfda /libavcodec/mpegvideo_motion.c | |
| parent | f7f74a37b82d7905e49aeb8beed02a9966f15ef6 (diff) | |
| parent | 93f305473f880729d18b5e42067f19d2106cb2e5 (diff) | |
Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'
* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
lavc: Convert some remaining strides to ptrdiff_t
Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_motion.c')
| -rw-r--r-- | libavcodec/mpegvideo_motion.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 09061d8dfe..42a00aa175 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -38,9 +38,8 @@ static void gmc1_motion(MpegEncContext *s, uint8_t **ref_picture) { uint8_t *ptr; - int src_x, src_y; + int src_x, src_y, motion_x, motion_y; ptrdiff_t offset, linesize, uvlinesize; - int motion_x, motion_y; int emu=0; motion_x= s->sprite_offset[0][0]; @@ -564,9 +563,9 @@ static void chroma_4mv_motion(MpegEncContext *s, op_pixels_func *pix_op, int mx, int my) { - int dxy, emu=0, src_x, src_y; - ptrdiff_t offset; uint8_t *ptr; + int src_x, src_y, dxy, emu = 0; + ptrdiff_t offset; /* In case of 8X8, we construct a single chroma motion vector with a special rounding */ |