Changeset 6bef3e55 in ffmpeg

Timestamp:

Jul 5, 2014, 5:11:26 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d5601cf6

Parents:

d3e51b41 (diff), 00933130 (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> (07/05/14 16:54:09)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/05/14 17:11:26)

Message:

Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'

• commit '009331303a6462d07cbe94aef9c446f1a1695519': x86: huffyuvdsp: Move inline assembly to init file

Conflicts:

libavcodec/x86/Makefile
libavcodec/x86/huffyuvdsp.h
libavcodec/x86/huffyuvdsp_init.c
libavcodec/x86/huffyuvdsp_mmx.c

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

(No files)