ffmpeg/doc
Michael Niedermayer 03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
..
doxy
examples Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
APIchanges Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-10-27 15:02:35 +02:00
Makefile doc/Makefile: generate library headers with the correct section number 2012-11-11 14:06:27 +01:00
RELEASE_NOTES
avtools-common-opts.texi cmdutils: allow to set the report file name. 2012-11-04 10:52:43 +01:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi
doxy-wrapper.sh doc: add apidoc target for doxygen API documentation 2012-11-02 18:28:56 +01:00
encoders.texi
errno.txt
eval.texi
faq.texi doc/faq: explain libfoo-dev packages. 2012-11-08 21:05:10 +01:00
fate.texi
fate_config.sh.template
ffmpeg.texi doc/ffmpeg: remove -debug option description 2012-11-03 11:01:48 +01:00
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffprobe.xsd
ffserver.conf
ffserver.texi doc/ffserver: fix typos/reword paragraphs about FFM versions 2012-11-06 11:35:14 +01:00
filter_design.txt
filters.texi Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
general.texi AVR demuxer 2012-11-05 17:31:22 +00:00
git-howto.texi doc: git-howto: Leave reviewers time to react before pushing patches 2012-11-11 20:43:28 +01:00
git-howto.txt
indevs.texi lavd/lavfi: add graph_file option 2012-10-23 22:08:55 +02:00
issue_tracker.txt
libavcodec.texi doc: add libavutil.texi 2012-11-11 11:15:53 +01:00
libavfilter.texi doc: add libavfilter.texi 2012-11-11 11:15:53 +01:00
libavutil.texi doc: add libavutil.texi 2012-11-11 11:15:53 +01:00
metadata.texi
mips.txt
multithreading.txt
muxers.texi doc/muxers: document mov faststart option. 2012-10-21 20:23:09 +02:00
nut.texi Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
optimization.txt Merge commit '652f5185945c8405fc57aed353286858df8d066f' 2012-10-31 14:02:35 +01:00
outdevs.texi
platform.texi doc: Point to the new location of the c99-to-c89 tool 2012-11-01 22:47:50 +02:00
print_options.c
protocols.texi
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt x86: mmx2 ---> mmxext in comments and messages 2012-10-31 00:37:42 +01:00
syntax.texi doc/syntax: add a "Quoting and escaping" section 2012-10-29 11:56:15 +01:00
t2h.init Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
tablegen.txt
texi2pod.pl doc/texi2pod.pl: drop unnecessary rule, which was converting "\," to "," 2012-10-24 23:33:47 +02:00
viterbi.txt