generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
c59b80c8d3
ffmpeg/doc
History
Michael Niedermayer c59b80c8d3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  isom: sort and pretty-print codec_movaudio_tags[]
  isom: remove pointless comments in codec_movaudio_tags[]
  isom: remove commented-out tag for vorbis
  movenc: write 'chan' tag for AC-3 in MOV
  mov: add support for reading and writing the 'chan' tag
  audioconvert: add some additional channel and channel layout macros
  audioconvert: change 7.1 "wide" layout to use side surround channels
  movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs
  doc: update documentation to use avconv
  doc: update demuxers section
  doc: extend external library coverage
  doc: split platform specific information
  doc: port the git-howto to texinfo
  doc: provide fallback css and customize @float
  doc: document fate in a texinfo
  doxy: change hue value to match our green

Conflicts:
	doc/fate.txt
	doc/ffserver.texi
	doc/general.texi
	doc/muxers.texi
	doc/protocols.texi
	doc/t2h.init
	libavformat/isom.c
	libavformat/mov.c
	libavutil/avutil.h
	tests/ref/acodec/pcm_s16be
	tests/ref/acodec/pcm_s24be
	tests/ref/acodec/pcm_s32be
	tests/ref/acodec/pcm_s8
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 02:01:03 +01:00
..
examples Merge remote-tracking branch 'qatar/master' 2011-12-09 00:05:51 +01:00
APIchanges APIchanges: add entry after av_buffersink_poll_frame() addition 2011-12-08 22:55:33 +01:00
avconv.texi Add option -n to exit if output file exists. 2011-11-24 21:42:42 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
bitstream_filters.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +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 docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
demuxers.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
developer.texi docs: Minor project name cleanup 2011-12-08 20:21:28 +01:00
encoders.texi doc: fix and clarify libx264 encoding. 2011-10-30 02:08:57 +02:00
eval.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
faq.texi docs: Minor project name cleanup 2011-12-08 20:21:28 +01:00
fate.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
fate.txt doc: document fate in a texinfo 2011-12-09 18:26:17 +01: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 docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
ffmpeg.txt doc: small ascii diagram on I/O files and streams in ffmpeg.c 2011-10-12 15:43:52 +02:00
ffplay.texi ffplay.texi: document -codec 2011-09-27 22:00:20 +02:00
ffprobe.texi ffprobe: add csv writer 2011-11-16 18:40:03 +01:00
ffserver.conf Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
filters.texi filters.texi: remove confusing reference to never integrated -af option 2011-12-09 15:53:23 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
git-howto.txt githowto: git is generally available as package in most distros. 2011-11-23 23:03:37 +01:00
indevs.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
Makefile doc: split platform specific information 2011-12-09 18:26:31 +01: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-12-10 02:01:03 +01:00
optimization.txt fix another forgotten mplayerhq.hu link 2011-04-08 01:35:43 +02:00
outdevs.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
platform.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
protocols.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
rate_distortion.txt The definition of rate and distortion is not conditional of lambda being 2009-03-30 10:39:20 +00:00
RELEASE_NOTES release_notes: document not fully understood mingw-sdl issue 2011-06-21 20:58:39 +02: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
swresample.txt swr-docs: update due to last change to swresample 2011-10-06 00:32:01 +02:00
swscale.txt Update SW scaler doc after libswscale commit 30841. 2010-03-05 08:34:31 +00:00
t2h.init Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +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