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
..
aviocat.c
bisect-create
bookmarklets.html
build_libstagefright
clean-diff
cws2fws.c
enum_options.c
ffescape.c
ffeval.c
fourcc2pixfmt.c
graph2dot.c
ismindex.c
make_chlayout_test
missing_codec_desc
patcheck	Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'	2013-01-23 17:44:56 +01:00
pktdumper.c
plotframes	tools: add plotframes script	2013-01-15 22:50:19 +01:00
probetest.c
qt-faststart.c
trasher.c
unwrap-diff
yuvcmp.c