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/vp56.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/vp56.c')
| -rw-r--r-- | libavcodec/vp56.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index d7d08f2fd9..6b9f3860bf 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -303,7 +303,7 @@ static void vp56_add_predictors_dc(VP56Context *s, VP56Frame ref_frame) } static void vp56_deblock_filter(VP56Context *s, uint8_t *yuv, - int stride, int dx, int dy) + ptrdiff_t stride, int dx, int dy) { int t = ff_vp56_filter_threshold[s->quantizer]; if (dx) s->vp56dsp.edge_filter_hor(yuv + 10-dx , stride, t); @@ -584,7 +584,8 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data, VP56Context *s = is_alpha ? s0->alpha_context : s0; AVFrame *const p = s->frames[VP56_FRAME_CURRENT]; int mb_row, mb_col, mb_row_flip, mb_offset = 0; - int block, y, uv, stride_y, stride_uv; + int block, y, uv; + ptrdiff_t stride_y, stride_uv; int res; if (p->key_frame) { |