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

Merge commit 'a786c825'


* commit 'a786c825':
  idct: Split off Xvid IDCT

Conflicts:
	libavcodec/Makefile
	libavcodec/mpeg4videodec.c
	libavcodec/x86/Makefile
	libavcodec/x86/idctdsp_init.c

This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.

The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ad99837b a786c825
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment