ffmpeg/doc
Michael Niedermayer b404ab9e74 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mov: Don't av_malloc(0).
  avconv: only allocate 1 AVFrame per input stream
  avconv: fix memleaks due to not freeing the AVFrame for audio
  h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
  misc Doxygen markup improvements
  doxygen: eliminate Qt-style doxygen syntax
  g722: Add a regression test for muxing/demuxing in wav
  g722: Change bits per sample to 4
  g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
  api-example: update to use avcodec_decode_audio4()
  avplay: use avcodec_decode_audio4()
  avplay: use a separate buffer for playing silence
  avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
  avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
  mov: Allow empty stts atom.
  doc: document preferred Doxygen syntax and make patcheck detect it

Conflicts:
	avconv.c
	ffplay.c
	libavcodec/mlpdec.c
	libavcodec/version.h
	libavformat/mov.c
	tests/codec-regression.sh
	tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-06 01:37:27 +01:00
..
examples Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +01:00
APIchanges lavu/error: define AVERROR_BUG. 2011-12-03 15:18:58 +01:00
Makefile
RELEASE_NOTES
avconv.texi Add option -n to exit if output file exists. 2011-11-24 21:42:42 +01:00
avtools-common-opts.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
demuxers.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
developer.texi Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +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 faq.texi: fix spelling errors 2011-11-29 18:25:43 +01:00
fate.txt doc: rewrite FATE documentation to be self-contained 2011-11-24 00:34:29 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
ffmpeg.txt
ffplay.texi
ffprobe.texi ffprobe: add csv writer 2011-11-16 18:40:03 +01:00
ffserver.conf
ffserver.texi doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
filters.texi lavfi: add life source 2011-12-04 21:18:37 +01:00
general.texi Microsoft Windows ICO demuxer 2011-12-04 16:44:20 +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 docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
issue_tracker.txt
libavfilter.texi doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
metadata.texi
multithreading.txt
muxers.texi doc: tiny spelling fix 2011-10-27 00:25:32 +02:00
optimization.txt
outdevs.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
protocols.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt
t2h.init Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
tablegen.txt
texi2pod.pl
viterbi.txt