Michael Niedermayer be315a3232 Merge remote branch 'qatar/master' ... * qatar/master: Duplicate AMV: disable DR1 and don't override EMU_EDGE Duplicate lavf: inspect more frames for fps when container time base is coarse Wrong and we have correct fix: Fix races in default av_log handler vorbis: Replace sized int_fast integer types with plain int/unsigned. Remove disabled non-optimized code variants. NO bswap.h: Remove disabled code. Remove some disabled printf debug cruft. Replace more disabled printf() calls by av_dlog(). NO tests: Remove disabled code. NO Replace some commented-out debug printf() / av_log() messages with av_dlog(). vorbisdec: Replace some sizeof(type) by sizeof(*variable). NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate. Conflicts: libavcodec/h264.c libavcodec/vorbisdec.c libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-04-30 01:58:26 +02:00
..
dsputil_align.c	Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.	2011-04-10 22:33:42 +02:00
dsputil_sh4.c	Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.	2011-04-10 22:33:42 +02:00
dsputil_sh4.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
idct_sh4.c	Merge remote branch 'qatar/master'	2011-04-30 01:58:26 +02:00
Makefile	Simplify arch-specific object file lists	2010-03-16 21:23:03 +00:00
qpel.c	Merge remote branch 'qatar/master'	2011-04-27 03:51:04 +02:00
sh4.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00