Changeset e2abc0d5 in ffmpeg

Timestamp:
May 27, 2014, 9:16:06 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
48a6916
Parents:
43c57db (diff), 0d439fbe (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> (05/27/14 21:07:36)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/27/14 21:16:06)
Message:

Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'

Conflicts:

configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvdec.c
libavcodec/lagarith.c
libavcodec/vble.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.