1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer f54e01c24e 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>
2014-08-01 16:21:52 +02:00
..
2014-06-02 20:18:44 +02:00
2014-07-16 20:55:24 +02:00
2014-06-03 10:58:19 -08:00
2014-06-15 12:11:46 +02:00
2014-06-15 12:11:46 +02:00
2014-06-03 10:58:19 -08:00
2014-07-18 00:48:34 +02:00
2014-07-16 14:27:45 +02:00
2014-08-01 12:20:01 +02:00
2014-07-28 00:47:28 +02:00
2014-05-31 13:41:10 +02:00
2014-06-05 20:31:59 +02:00
2014-06-05 20:31:59 +02:00
2014-07-21 01:25:33 -07:00
2014-05-25 05:19:09 +02:00
2014-05-25 19:25:10 +02:00
2014-07-18 13:31:19 +02:00
2014-07-12 22:33:27 +02:00
2014-06-07 17:44:23 +02:00
2014-06-07 17:44:14 +02:00
2014-06-07 17:44:14 +02:00
2014-07-10 15:29:54 +02:00
2014-06-18 03:13:37 +02:00
2014-07-16 14:38:42 +02:00
2014-06-18 03:13:37 +02:00
2014-06-18 03:13:36 +02:00
2014-06-18 03:13:36 +02:00