Changeset d7463c68 in ffmpeg

Timestamp:

Jun 23, 2014, 7:10:10 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

476bd3c7

Parents:

32cf26cc (diff), fab9df63 (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> (06/23/14 18:59:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/23/14 19:10:10)

Message:

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

• commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf': dsputil: Split off global motion compensation bits into a separate context

Conflicts:

libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

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

(No files)