git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Wed, 23 Jan 2013 16:44:56 +0000 (17:44 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Wed, 23 Jan 2013 16:44:56 +0000 (17:44 +0100)
commit	ac8987591f5503768e7587c25693928f26fcb3d1
tree	2531b37d6673aea7f4d1c61549978664a2c807ac	tree \| snapshot
parent	a793a587df05bfc789e040c13329825cf9a261a3	commit \| diff
parent	88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f	commit \| diff

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>

157 files changed:

doc/optimization.txt	diff1 \|	diff2 \|	blob \| history
libavcodec/4xm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/dsputil_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/dsputil_alpha.h	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/dsputil_alpha_asm.S	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/motion_est_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/mpegvideo_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/simple_idct_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_armv5te.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_armv6.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_neon.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/h264dsp_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_armv5te.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/rv34dsp_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/simple_idct_armv6.S	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/simple_idct_neon.S	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/vp3dsp_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/vp8.h	diff1 \|	diff2 \|	blob \| history
libavcodec/asv.h	diff1 \|	diff2 \|	blob \| history
libavcodec/asvdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/asvenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/config_bfin.h	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/dsputil_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/dsputil_bfin.h	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/fdct_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/idct_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/mpegvideo_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/pixels_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/vp3_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/vp3_idct_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bink.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavs.h	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dct-test.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhddec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhdenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhdenc.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dvdata.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dvdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eaidct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eaidct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/eamad.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eatgq.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eatqi.c	diff1 \|	diff2 \|	blob \| history
libavcodec/faandct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/faanidct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/faanidct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h261dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h261enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h263.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h263.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_cabac.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_cavlc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_mb_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264idct_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264pred.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264pred_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ituh263dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ituh263enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/jrevdct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mimic.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegenc.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4video.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4videodec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4videoenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_xvmc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4.h	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_ppc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/h264_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/mpegvideo_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/vc1dsp_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/vp3dsp_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdec2.c	diff1 \|	\|	blob \| history
libavcodec/proresdec_lgpl.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/proresenc_anatoliy.c	diff1 \|	\|	blob \| history
libavcodec/proresenc_kostya.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rtjpeg.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rtjpeg.h	diff1 \|	diff2 \|	blob \| history
libavcodec/rv34.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/dsputil_sh4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/dsputil_sh4.h	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/idct_sh4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/simple_idct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/simple_idct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/simple_idct_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sparc/dsputil_vis.h	diff1 \|	diff2 \|	blob \| history
libavcodec/sparc/simple_idct_vis.c	diff1 \|	diff2 \|	blob \| history
libavcodec/svq3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp56.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2.h	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dnxhdenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.h	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputilenc.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputilenc_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_idct.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_intrapred_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/idct_mmx_xvid.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/idct_xvid.h	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/mpegvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/mpegvideoenc_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/proresdsp.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/proresdsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/simple_idct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vc1dsp_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp3dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp8dsp.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp8dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavfilter/libmpcodecs/vf_fspp.c	diff1 \|	\|	blob \| history
libavfilter/libmpcodecs/vf_pp7.c	diff1 \|	\|	blob \| history
libavfilter/libmpcodecs/vf_spp.c	diff1 \|	\|	blob \| history
libavfilter/vf_decimate.c	diff1 \|	\|	blob \| history
tools/patcheck	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

doc/optimization.txt	diff1 \|	diff2 \|	blob \| history
libavcodec/4xm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/dsputil_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/dsputil_alpha.h	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/dsputil_alpha_asm.S	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/motion_est_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/mpegvideo_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/simple_idct_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_armv5te.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_armv6.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_neon.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/h264dsp_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_armv5te.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/rv34dsp_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/simple_idct_armv6.S	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/simple_idct_neon.S	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/vp3dsp_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/vp8.h	diff1 \|	diff2 \|	blob \| history
libavcodec/asv.h	diff1 \|	diff2 \|	blob \| history
libavcodec/asvdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/asvenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/config_bfin.h	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/dsputil_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/dsputil_bfin.h	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/fdct_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/idct_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/mpegvideo_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/pixels_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/vp3_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/vp3_idct_bfin.S	diff1 \|	diff2 \|	blob \| history
libavcodec/bink.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavs.h	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dct-test.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhddec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhdenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhdenc.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dvdata.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dvdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eaidct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eaidct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/eamad.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eatgq.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eatqi.c	diff1 \|	diff2 \|	blob \| history
libavcodec/faandct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/faanidct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/faanidct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h261dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h261enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h263.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h263.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_cabac.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_cavlc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_mb_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264idct_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264pred.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264pred_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ituh263dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ituh263enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/jrevdct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mimic.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegenc.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4video.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4videodec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4videoenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_xvmc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4.h	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_ppc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/h264_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/mpegvideo_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/vc1dsp_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/vp3dsp_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdec2.c	diff1 \|	\|	blob \| history
libavcodec/proresdec_lgpl.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/proresenc_anatoliy.c	diff1 \|	\|	blob \| history
libavcodec/proresenc_kostya.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rtjpeg.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rtjpeg.h	diff1 \|	diff2 \|	blob \| history
libavcodec/rv34.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/dsputil_sh4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/dsputil_sh4.h	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/idct_sh4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/simple_idct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/simple_idct.h	diff1 \|	diff2 \|	blob \| history
libavcodec/simple_idct_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sparc/dsputil_vis.h	diff1 \|	diff2 \|	blob \| history
libavcodec/sparc/simple_idct_vis.c	diff1 \|	diff2 \|	blob \| history
libavcodec/svq3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp56.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2.h	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2dsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dnxhdenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.h	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputilenc.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputilenc_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_idct.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_intrapred_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/idct_mmx_xvid.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/idct_xvid.h	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/mpegvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/mpegvideoenc_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/proresdsp.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/proresdsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/simple_idct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vc1dsp_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp3dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp8dsp.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp8dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavfilter/libmpcodecs/vf_fspp.c	diff1 \|	\|	blob \| history
libavfilter/libmpcodecs/vf_pp7.c	diff1 \|	\|	blob \| history
libavfilter/libmpcodecs/vf_spp.c	diff1 \|	\|	blob \| history
libavfilter/vf_decimate.c	diff1 \|	\|	blob \| history
tools/patcheck	diff1 \|	diff2 \|	blob \| history