Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 11:08:37 +0000 (13:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 11:08:37 +0000 (13:08 +0200)
commit10c6d1b28cbd0f39915649940821184d8278eaea
tree6ac53e4fe6e0c23f72033ecfb2280895f653cfda
parentf7f74a37b82d7905e49aeb8beed02a9966f15ef6
parent93f305473f880729d18b5e42067f19d2106cb2e5
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>
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp3.c
libavcodec/vp56.c