Changeset 98227ba5 in ffmpeg

Timestamp:

Jul 13, 2014, 7:08:28 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cc3e7a4c

Parents:

4cc0f79a (diff), a8552ee (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 'a8552ee3eb335d2fd2d6c99363367a6090298f78'

• commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78': ppc: dsputil: Coalesce all init files

Conflicts:

libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c

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

(No files)