summaryrefslogtreecommitdiff
path: root/libavcodec/x86/xvididct_init.c
Commit message (Collapse)AuthorAge
* Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'Michael Niedermayer2014-09-03
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453': xvid: Add C IDCT Conflicts: libavcodec/dct-test.c libavcodec/xvididct.c See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xvid: Add C IDCTPascal Massimino2014-09-02
| | | | | | | | | | | | Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5': cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs Conflicts: libavcodec/mpeg4videodec.c libavcodec/x86/Makefile libavcodec/x86/dct-test.c libavcodec/x86/xvididct_sse2.c libavcodec/xvididct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTsDiego Biurrun2014-08-27
| |
* | Merge commit '84d173d3de97c753234ab0c0b50551d51413d663'Michael Niedermayer2014-08-08
|\| | | | | | | | | | | | | * commit '84d173d3de97c753234ab0c0b50551d51413d663': xvididct: Ensure that the scantable permutation is always set correctly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xvididct: Ensure that the scantable permutation is always set correctlyDiego Biurrun2014-08-08
| | | | | | | | | | This fixes cases where the scantable permuation would get overwritten by the general idctdsp initialization.
* | Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'Michael Niedermayer2014-08-01
|/ | | | | | | | | | | | | | | | | | | * 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>
* idct: Split off Xvid IDCTDiego Biurrun2014-08-01
The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files, so there is no point in having it as an unconditional part of idctdsp.