Changeset 3f9e2aad in ffmpeg

Timestamp:

Jan 31, 2014, 2:18:44 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

aa36dcf

Parents:

e53ec2fe (diff), 7716dd9f (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> (01/31/14 14:16:44)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/31/14 14:18:44)

Message:

Merge commit '7716dd9fbbcea2700a100c995df967d5547c2eb9'

• commit '7716dd9fbbcea2700a100c995df967d5547c2eb9': xvid: switch to xvid mmx idct as soon as possible

Conflicts:

libavcodec/mpeg4videodec.c

Not merged, as the bug was not merged either

See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f, and related commits
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)