1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/tests
Michael Niedermayer 41bf67d8d4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
  avconv: remove a write-only variable
  avconv: remove pointless parameter from new_*_stream().
  avconv: cosmetics, move code
  avconv: cosmetics -- move copy_chapters().
  avconv: cosmetics -- move parse_forced_key_frames().
  lavc: add audio flag to the 'b' option, deprecate 'ab'.
  avconv: rename sameq to same_quant
  doc/avconv: add forgotten end of chapter.
  Changelog: document avconv incompatibilities with ffmpeg.
  avconv: replace -vcodec/-acodec/-scodec with a better system.
  avconv: remove presets.
  svq3: propagate codec memory allocation failure in context init

Conflicts:
	Changelog
	avconv.c
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-16 23:47:35 +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-13 22:24:47 +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 Split fate-psx-str-v3 into a video-only and audio-only test. 2011-03-26 16:39:22 -04: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-16 23:47:35 +02:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm
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 fate: more cases of avconv that should be conditional 2011-08-16 03:38:00 +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