RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests
History
Michael Niedermayer 411cc5c46a Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  audioconvert: add explanatory comments to channel_names array
  audioconvert: K&R whitespace cosmetics
  avconv: use correct index when selecting metadata to write to.
  avconv: fix inverted variable
  doc/avconv: document option types (input/output/per-stream/...)
  doc/avtools-common-opts: write a section about stream specifiers.
  doc/avconv: remove two pointless paragraphs.
  doc/avconv: document that global options should be specified first.
  doc/avconv: remove entries for nonexistent options
  doc/avconv: remove documentation for removed 'timestamp' option
  doc: cosmetics, rename fftools-common-opts to avtools-....
  avconv: move streamid_map to options context.
  avconv: extend -vf syntax
  avconv: move top_field_first to options context.
  avconv: move inter/intra matrix to options context.
  avconv: remove -psnr option.
  avconv: remove me_threshold option.
  avconv: move video_rc_override_string to options context.
  avconv: move frame pixel format to the options context.
  avconv: move frame aspect ratio to the options context.
  ...

Conflicts:
	avconv.c
	cmdutils_common_opts.h
	doc/avconv.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-09-12 00:32:54 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
ref Allow reading of growing avi files (ie currently being written) 2011-09-11 17:44:20 +02:00
Makefile fate: Switch default tool to test from avconv to ffmpeg 2011-08-30 18:16:03 +02:00
audiogen.c
…
base64.c
…
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
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
fate-update.sh
…
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
…
fate2.mak avconv: move start_time, recording_time and input_ts_offset to options context 2011-09-04 13:12:00 +02: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-12 00:32:54 +02:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm
…
md5.sh
…
regression-funcs.sh Revert "avconv: use stream copy by default when possible." 2011-08-16 20:59:14 +02:00
rotozoom.c
…
tiny_psnr.c
…
videogen.c
…