Michael Niedermayer 124deea1a0 Merge remote-tracking branch 'qatar/master' ... * qatar/master: libx264: only use ABR mode when the user explicitly set bitrate. libx264: use medium preset by default. mp2 encoder: make 128k the default bitrate. movenc: use libx264 by default when possible for mov, mp4 and psp avienc: saner default audio codec. matroskaenc: saner default codecs. avplay: add examples of how to specify size/pixel format through private options lavc: add A|E|D flags to "ac" and "ar" options Conflicts: doc/ffplay.texi libavcodec/libx264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-08-22 15:00:53 +02:00
..
fate	fate: test more FFT etc sizes	2011-07-04 18:33:04 +01:00
ref	Merge remote-tracking branch 'qatar/master'	2011-08-18 10:56:08 +02:00
audiogen.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
base64.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-08-16 23:47:35 +02:00
copycooker.sh	build: remove unused copy regression test script	2011-07-07 22:47:24 +02:00
fate2.mak	ffmpeg: use new avformat_open_* API.	2011-07-14 18:22:36 +02:00
fate-run.sh	fate: more cases of avconv that should be conditional	2011-08-16 03:38:00 +02:00
fate-update.sh	fate: remove stale fate-update.sh script	2011-03-19 13:35:52 +00:00
fate.mak	Revert "avconv: use stream copy by default when possible."	2011-08-16 20:59:14 +02:00
fate.sh	fate: add comment field	2011-05-20 13:50:52 +01:00
ffserver-regression.sh	Remove the ffserver test.	2011-08-01 11:36:16 +02:00
ffserver.conf	Remove the ffserver test.	2011-08-01 11:36:16 +02:00
ffserver.regression.ref	Remove the ffserver test.	2011-08-01 11:36:16 +02:00
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-08-22 15:00:53 +02:00
lavfi-regression.sh	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
lena.pnm	finished integrating rotozoom test in ffmpeg	2003-04-11 13:43:17 +00:00
Makefile	fate: allow specifying the tool to use for fate (avconv / ffmpeg)	2011-08-15 23:11:46 +02:00
md5.sh	regtest: add openssl to md5 alternatives	2011-01-18 20:48:24 +00:00
regression-funcs.sh	Revert "avconv: use stream copy by default when possible."	2011-08-16 20:59:14 +02:00
rotozoom.c	Merge remote branch 'qatar/master'	2011-05-12 04:51:24 +02:00
tiny_psnr.c	tests: Remove disabled code.	2011-04-29 18:08:46 +02:00
videogen.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00