[FFmpeg-cvslog] Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'

Fri Aug 1 16:24:06 CEST 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 15:38:24 2014 +0200| [f54e01c24e03a7dc340bd9449debfe7fb58987da] | committer: Michael Niedermayer

Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'

* commit 'a786c8259dafeca9744252230b5d78f67810770c':
  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: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f54e01c24e03a7dc340bd9449debfe7fb58987da
---