ffmpeg/doc
Michael Niedermayer 620c6292b1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: Fix Ogg demuxer dependencies
  build: Fix FLAC demuxer dependencies
  flac: Move flac functions shared between libraries to flac common code
  build: Fix CAF demuxer dependencies
  build: Fix MP2 muxer dependencies
  build: Add missing build rules for the ISMV muxer
  configure: Drop redundant mxf_d10 test dependency declaration
  Support AAC encoding via the external library fdk-aac
  libavcodec: Add more AAC profiles
  dct/fft-test: use a replacement getopt() if the system has none present.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-12 23:57:00 +02:00
..
doxy
examples examples/filtering: fix packet memleak 2012-06-26 19:04:17 +02:00
APIchanges lavc: add av_fast_padded_mallocz 2012-07-10 21:42:23 +00:00
Makefile
RELEASE_NOTES
avtools-common-opts.texi
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi doc/developer: refer to av_malloc() instead of malloc() 2012-07-02 21:24:47 +02:00
encoders.texi doc/encoders: update libvpxenc mappings 2012-06-13 11:33:00 +02:00
errno.txt
eval.texi Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
faq.texi doc/faq: Update video joining examples 2012-06-22 01:36:14 +02:00
fate.texi doc/fate: Rework examples to a section of its own 2012-07-05 10:55:49 +02:00
ffmpeg.texi doc: update mono to stereo workaround example 2012-07-07 17:37:16 +02:00
ffmpeg.txt
ffplay.texi
ffprobe.texi ffprobe: add -show_data option. 2012-06-18 09:38:36 +02:00
ffprobe.xsd ffprobe: dump AVPacket.convergence_duration. 2012-06-18 09:39:17 +02:00
ffserver.conf
ffserver.texi
filter_design.txt
filters.texi lavfi: implement asettb filter. 2012-07-08 19:54:08 +02:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
git-howto.texi cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
git-howto.txt
indevs.texi doc/indevs/iec61883: document requirements for iec61883 device 2012-07-06 11:47:50 +02:00
issue_tracker.txt
libavfilter.texi
metadata.texi
mips.txt doc: add documentation regarding MIPS optimizations 2012-07-03 22:06:10 +02:00
multithreading.txt
muxers.texi lavf/segment: add -segment_time_delta option 2012-07-10 00:53:01 +02:00
optimization.txt
outdevs.texi sdl: fix aspect ratio computations. 2012-06-10 09:57:50 +02:00
platform.texi
print_options.c
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt