Michael Niedermayer 17106a7c90 Merge remote-tracking branch 'qatar/master' ... * qatar/master: audio_frame_queue: Clean up ff_af_queue_log_state debug function dwt: Remove unused code. cavs: convert cavsdata.h to a .c file cavs: Move inline functions only used in one file out of the header cavs: Move data tables used in only one place to that file fate: Add a single symbol Ut Video decoder test vf_hqdn3d: x86 asm vf_hqdn3d: support 16bit colordepth avconv: prefer user-forced input framerate when choosing output framerate Conflicts: ffmpeg.c libavcodec/audio_frame_queue.c libavcodec/dwt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-26 22:40:02 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-08-26 22:40:02 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2012-08-26 22:40:02 +02:00
Makefile	Merge remote-tracking branch 'qatar/master'	2012-08-23 14:33:33 +02:00
asynth1.sw	…
audiogen.c	Merge remote-tracking branch 'qatar/master'	2012-07-29 02:16:26 +02:00
base64.c	…
copycooker.sh	…
fate-run.sh	…
fate-update.sh	…
fate-valgrind.supp	…
fate.sh	…
fate_config.sh.template	…
ffserver-regression.sh	…
ffserver.conf	…
ffserver.regression.ref	…
lavf-regression.sh	…
lavfi-regression.sh	lavfi: add edgedetect filter.	2012-08-16 22:03:32 +02:00
lena.pnm	…
md5.sh	…
regression-funcs.sh	…
rotozoom.c	…
tiny_psnr.c	tiny_psnr: fix undefined shift	2012-08-01 20:00:01 +02:00
utils.c	…
videogen.c	…