1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/tests
Michael Niedermayer d2084402e6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: fix type for thread_type option
  avconv: move format to options context
  avconv: move limit_filesize to options context
  avconv: move start_time, recording_time and input_ts_offset to options context
  avconv: add a context for options.
  cmdutils: allow storing per-stream/chapter/.... options in a generic way
  cmdutils: split per-option code out of parse_options().
  cmdutils: add support for caller-provided option context.
  cmdutils: declare only one pointer type in OptionDef
  cmdutils: move grow_array() from avconv to cmdutils.
  cmdutils: move exit_program() declaration to cmdutils from avconv
  http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
  nutenc: add namespace to the api facing functions

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	ffprobe.c
	ffserver.c
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-05 03:10:45 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
ref Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +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 codec-regression: force vsync 0 on the me_threshold test to make sure frames match. 2011-09-01 16:35:38 -07:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate2.mak avconv: move start_time, recording_time and input_ts_offset to options context 2011-09-04 13:12:00 +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 avconv: move start_time, recording_time and input_ts_offset to options context 2011-09-04 13:12:00 +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-09-05 03:10:45 +02:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm
Makefile fate: Switch default tool to test from avconv to ffmpeg 2011-08-30 18:16:03 +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