RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/doc
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
..
examples examples/muxing.c: apply misc style fixes 2011-07-27 02:05:49 +02:00
APIchanges lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
Makefile build: create output directories as needed 2011-06-29 09:14:56 +01:00
RELEASE_NOTES release_notes: document not fully understood mingw-sdl issue 2011-06-21 20:58:39 +02:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
bitstream_filters.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
build_system.txt Revert some silly renamings that leaked in from a pull. 2011-03-29 02:27:13 +02:00
decoders.texi decoders.texi: fix typos in rawvideo section 2011-05-20 10:14:00 +02:00
demuxers.texi Rename ffplay to avplay. 2011-08-09 19:56:21 +02:00
developer.texi developer.texi: Suggest a git clone if the patch review process doesnt work out 2011-08-23 04:34:14 +02:00
encoders.texi doc: cosmetics: libx264 typos 2011-06-02 14:43:29 +02:00
eval.texi eval: add support for pow() function 2011-06-07 00:37:00 +02:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
fate.txt fate.txt: replace FATE rsync command with a make command 2011-05-27 10:41:46 +02:00
ffmpeg-mt-authorship.txt Include authorship information from ffmpeg-mt at Ronald S. Bultjes request. 2011-04-19 01:17:59 +02:00
ffmpeg.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
ffplay.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
ffprobe.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
ffserver.conf Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
filters.texi Correct docs for boxblur parameters 2011-09-07 04:18:43 +02:00
general.texi Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
git-howto.txt fix typo 2011-04-10 04:31:54 +02:00
indevs.texi indevs.texi: fix typo (builf -> build) 2011-08-11 17:32:54 +02:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi Remove reference to the libavfilter soc SVN repo, update libavfilter status description 2011-09-10 23:40:52 +02:00
metadata.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
multithreading.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
muxers.texi Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
optimization.txt fix another forgotten mplayerhq.hu link 2011-04-08 01:35:43 +02:00
outdevs.texi sdl: use the filename for defining the window title, if not specified 2011-06-05 13:17:38 +02:00
protocols.texi Rename ffplay to avplay. 2011-08-09 19:56:21 +02:00
rate_distortion.txt The definition of rate and distortion is not conditional of lambda being 2009-03-30 10:39:20 +00:00
snow.txt Use a consistent capitalization for 'Snow' as discussed on the list 2008-02-08 19:17:46 +00:00
soc.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
swscale.txt Update SW scaler doc after libswscale commit 30841. 2010-03-05 08:34:31 +00:00
t2h.init doc: modify style for texi2html 1.78+ 2011-01-30 03:41:47 +01:00
tablegen.txt Update tablegen documentation for WRITE_ARRAY macro. 2010-06-27 14:31:50 +00:00
texi2pod.pl doc: replace @pxref by @ref where appropriate 2011-07-09 21:53:59 +02:00
viterbi.txt Quick description of the Viterbi algorithm so I do not have to repeat it 2009-03-03 15:35:20 +00:00