Michael Niedermayer 10c6d1b28c 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>

2013-10-16 13:08:37 +02:00

157 KiB

Raw Blame History

View Raw