[FFmpeg-cvslog] Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 13:08:37 2013 +0200| [10c6d1b28cbd0f39915649940821184d8278eaea] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10c6d1b28cbd0f39915649940821184d8278eaea
---