Changeset ea41e6d6 in ffmpeg

Timestamp:

Nov 24, 2014, 11:13:00 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

010adacb

Parents:

b4d8724a (diff), 9c12c6ff (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/24/14 10:39:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/24/14 11:13:00)

Message:

Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'

• commit '9c12c6ff9539e926df0b2a2299e915ae71872600': motion_est: convert stride to ptrdiff_t

Conflicts:

libavcodec/me_cmp.c
libavcodec/ppc/me_cmp.c
libavcodec/x86/me_cmp_init.c

See: 9c669672c7fd45ef1cad782ab551be438ceac6cd
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)