Changeset 2b05db4f in ffmpeg

Timestamp:

Jun 19, 2014, 2:54:38 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

042a82ca

Parents:

ab12373 (diff), e74433a8 (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/19/14 02:41:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/19/14 02:54:38)

Message:

Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

• commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context

Conflicts:

configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c

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

(No files)