Files
FFmpeg/doc
Michael Niedermayer ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:44:56 +01:00
..
2012-10-08 11:22:42 +02:00
2013-01-02 23:52:35 +01:00
2012-01-28 11:04:19 +01:00
2012-12-15 11:46:47 +01:00
2013-01-21 15:20:42 +00:00
2013-01-21 10:24:45 +00:00
2012-12-21 00:18:34 +01:00
2013-01-19 14:32:29 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2012-10-02 09:43:27 +02:00
2012-12-21 00:18:34 +01:00