1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer 14e2406de7 Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/asvenc.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 03:19:06 +02:00
..
2014-06-08 02:37:20 +02:00
2014-06-08 02:37:20 +02:00
2014-04-11 12:09:09 +02:00
2014-05-21 03:25:08 +02:00
2014-06-25 14:49:44 +02:00
2014-05-29 21:47:40 +02:00
2014-06-05 20:31:59 +02:00
2014-04-19 09:56:01 +02:00
2014-04-19 09:56:01 +02:00
2014-05-21 03:25:08 +02:00
2014-06-08 02:37:20 +02:00
2014-03-29 18:13:15 +01:00
2014-04-19 09:56:01 +02:00