Michael Niedermayer 8e2bab5d4b Merge remote-tracking branch 'qatar/master' ... * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-12-08 00:23:37 +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
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	Remove unused softfloat implementation.	2011-05-11 13:43:30 +02:00
bitstream_filters.texi
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	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-08 00:23:37 +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	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	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	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	build: create output directories as needed	2011-06-29 09:14:56 +01:00
metadata.texi
multithreading.txt
muxers.texi	doc: tiny spelling fix	2011-10-27 00:25:32 +02: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
protocols.texi	docs: Spelling fixes to 9 texi files from /doc	2011-11-29 18:26:06 +01:00
rate_distortion.txt
RELEASE_NOTES	release_notes: document not fully understood mingw-sdl issue	2011-06-21 20:58:39 +02:00
snow.txt
soc.txt
swresample.txt	swr-docs: update due to last change to swresample	2011-10-06 00:32:01 +02:00
swscale.txt
t2h.init	Merge remote-tracking branch 'qatar/master'	2011-11-15 03:13:42 +01:00
tablegen.txt
texi2pod.pl	doc: replace @pxref by @ref where appropriate	2011-07-09 21:53:59 +02:00
viterbi.txt