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_enc.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_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 655cc592f9..9b503865c6 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -984,8 +984,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) if (pic_arg->linesize[2] != s->uvlinesize) direct = 0; - av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0], - pic_arg->linesize[1], (int) s->linesize, (int) s->uvlinesize); + av_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0], + pic_arg->linesize[1], s->linesize, s->uvlinesize); if (direct) { i = ff_find_unused_picture(s, 1); |