diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 13:08:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 13:08:37 +0200 |
| commit | 10c6d1b28cbd0f39915649940821184d8278eaea (patch) | |
| tree | 6ac53e4fe6e0c23f72033ecfb2280895f653cfda /libavcodec/vp3.c | |
| parent | f7f74a37b82d7905e49aeb8beed02a9966f15ef6 (diff) | |
| parent | 93f305473f880729d18b5e42067f19d2106cb2e5 (diff) | |
| download | ffmpeg-10c6d1b28cbd0f39915649940821184d8278eaea.tar.gz | |
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/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 12fe3abc35..b21b6e2437 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1294,7 +1294,7 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int ye int width = s->fragment_width[!!plane]; int height = s->fragment_height[!!plane]; int fragment = s->fragment_start [plane] + ystart * width; - int stride = s->current_frame.f->linesize[plane]; + ptrdiff_t stride = s->current_frame.f->linesize[plane]; uint8_t *plane_data = s->current_frame.f->data [plane]; if (!s->flipped_image) stride = -stride; plane_data += s->data_offset[plane] + 8*ystart*stride; |