Commit 3f9e2aad authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7716dd9f'

* commit '7716dd9f':
  xvid: switch to xvid mmx idct as soon as possible

Conflicts:
	libavcodec/mpeg4videodec.c

Not merged, as the bug was not merged either

See: 6c9b82b6, and related commits
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e53ec2fe 7716dd9f
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment