Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 13:38:24 +0000 (15:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:21:52 +0000 (16:21 +0200)
commitf54e01c24e03a7dc340bd9449debfe7fb58987da
tree2deebee8ec6d0cf34cbe02bce336229323df4b42
parentad99837b638f1271da37dbe75d409b1350ad556e
parenta786c8259dafeca9744252230b5d78f67810770c
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@gmx.at>
libavcodec/Makefile
libavcodec/idctdsp.c
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/idctdsp_init.c
libavcodec/x86/xvididct_init.c
libavcodec/xvididct.c
libavcodec/xvididct.h