Michael Niedermayer 244682dd08 Merge remote-tracking branch 'qatar/master' ... * qatar/master: log: Only include unistd.h if configure found it ape: create audio stream before reading tags. mov: make a length variable larger. image2: Add "start_number" private option to the demuxer image2: Add "start_number" private option to the muxer avconv: remove a forgotten debugging printf. avconv: use more descriptive names for hardcoded filters. avconv: remove redundant handling of async. doc/filters: fix typo. h264: use asm cabac reader under a generic condition Conflicts: ffmpeg.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-06-24 21:34:54 +02:00
..
doxy
examples	examples/filtering_audio: update for avfilter API "cleanup"	2012-06-24 14:15:53 +02:00
APIchanges	lavu: split version info into version.h	2012-06-24 12:34:12 +02:00
avtools-common-opts.texi	cmdutils: allow to specify a stream by its ID.	2012-05-20 12:47:27 +02:00
avutil.txt
bitstream_filters.texi	Merge remote-tracking branch 'qatar/master'	2012-02-25 04:00:43 +01:00
build_system.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00
decoders.texi
demuxers.texi
developer.texi	build: Add 'check' target to run all compile and test targets.	2012-05-15 19:10:46 +02:00
encoders.texi	doc/encoders: update libvpxenc mappings	2012-06-13 11:33:00 +02:00
errno.txt
eval.texi	eval: add root() to solve f(x)=0	2012-02-27 00:00:55 +01:00
faq.texi	doc/faq: Update video joining examples	2012-06-22 01:36:14 +02:00
fate.texi	Merge remote-tracking branch 'qatar/master'	2012-06-15 00:14:21 +02:00
ffmpeg.texi	doc/ffmpeg.texi: use an exising preset file name	2012-06-20 15:29:46 +02:00
ffmpeg.txt
ffplay.texi	doc: add syntax.texi file	2012-05-22 00:39:53 +02:00
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	Merge remote-tracking branch 'qatar/master'	2012-02-10 01:20:07 +01:00
ffserver.texi
filter_design.txt	lavfi: drop planar/packed negotiation support	2012-05-16 13:16:05 +02:00
filters.texi	Merge remote-tracking branch 'qatar/master'	2012-06-24 21:34:54 +02:00
general.texi	Replace Libav with FFmpeg	2012-06-21 12:33:28 +00:00
git-howto.texi	Merge remote-tracking branch 'qatar/master'	2012-04-13 21:50:37 +02:00
git-howto.txt
indevs.texi	v4l2: allow to convert monotonic timestamps.	2012-04-04 15:22:44 +02:00
issue_tracker.txt
libavfilter.texi
Makefile	doc: add syntax.texi file	2012-05-22 00:39:53 +02:00
metadata.texi
multithreading.txt
muxers.texi	doc/muxers: add documentation for the md5 and framemd5 muxers	2012-04-07 13:57:40 +02:00
optimization.txt
outdevs.texi	sdl: fix aspect ratio computations.	2012-06-10 09:57:50 +02:00
platform.texi	Merge remote-tracking branch 'qatar/master'	2012-05-19 00:52:25 +02:00
print_options.c	print_options: warn that the files are generated.	2012-04-23 18:14:25 +02:00
protocols.texi	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
rate_distortion.txt
RELEASE_NOTES	release_notes: update	2012-05-25 17:27:40 +02:00
snow.txt
soc.txt
swresample.txt	cosmetics: fix some typos	2012-03-13 01:14:04 +01:00
swscale.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00
syntax.texi	doc/syntax: escape '@' to fix a warning.	2012-05-29 07:40:58 +02:00
t2h.init
tablegen.txt
texi2pod.pl	doc: texi2pod: add -I flag	2012-03-20 11:10:25 +00:00
viterbi.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00