Skip to content
Snippets Groups Projects
Commit 5b58d79a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '7a1d6ddd' 


* commit '7a1d6ddd':
  xvid: Add C IDCT

Conflicts:
	libavcodec/dct-test.c
	libavcodec/xvididct.c

See: 298b3b6c
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5db23c07 7a1d6ddd
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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