aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideo_common.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-26 00:18:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-26 00:18:12 +0200
commitc8ca38567669278dde3a50d2d7e4fa2f831ef044 (patch)
treed87070f53eeaa55bd2b6989b1e0c8bff41f41cec /libavcodec/mpegvideo_common.h
parentc6a4397410ab5f1b22cbc9f1ccb3126b3e5d6125 (diff)
parentb0ca5fef09d1b1268ea0c8f89bf53cd38aaa85e7 (diff)
downloadffmpeg-c8ca38567669278dde3a50d2d7e4fa2f831ef044.tar.gz
Merge commit 'b0ca5fef09d1b1268ea0c8f89bf53cd38aaa85e7' into release/0.10
* commit 'b0ca5fef09d1b1268ea0c8f89bf53cd38aaa85e7': dv: Add a guard to not overread the ppcm array mpegvideo: Avoid 32-bit wrapping of linesize multiplications mjpegb: Detect changing number of planes in interlaced video matroskadec: Check that .lang was allocated and set before reading it ape demuxer: check for EOF in potentially long loops lavf: avoid integer overflow when estimating bitrate pictordec: break out of both decoding loops when y drops below 0 ac3: Return proper error codes Conflicts: libavcodec/pictordec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_common.h')
-rw-r--r--libavcodec/mpegvideo_common.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h
index 947112b4be..debd6bae17 100644
--- a/libavcodec/mpegvideo_common.h
+++ b/libavcodec/mpegvideo_common.h
@@ -244,7 +244,8 @@ void mpeg_motion_internal(MpegEncContext *s,
{
uint8_t *ptr_y, *ptr_cb, *ptr_cr;
int dxy, uvdxy, mx, my, src_x, src_y,
- uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize;
+ uvsrc_x, uvsrc_y, v_edge_pos;
+ ptrdiff_t uvlinesize, linesize;
#if 0
if(s->quarter_sample)