Changeset 10c6d1b in ffmpeg

Timestamp:

Oct 16, 2013, 11:08:37 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8610751

Parents:

f7f74a37 (diff), 93f30547 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)