Michael Niedermayer 93342de1d8 Merge remote-tracking branch 'qatar/master' ... * qatar/master: rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code rtmp: Move the CONFIG_ condition into the if conditions aac: Mention abbreviation as well in long_name build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled doc: Add Git configuration section configure: Add a dependency on https for rtmpts rtp: Only choose static payload types if the sample rate and channels are right Conflicts: doc/git-howto.texi libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-07-24 21:15:57 +02:00
..
doxy	doxygen: cleanup style to support older doxy	2011-12-29 17:19:46 +01:00
examples	examples/filtering: fix packet memleak	2012-06-26 19:04:17 +02:00
APIchanges	avcodec: add decode_error_flags field to AVFrame	2012-07-21 05:48:31 +02:00
avtools-common-opts.texi	doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section	2012-07-20 12:56:28 +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	lavc: add ffwavesynth pseudo-codec.	2011-12-15 18:38:04 +01:00
demuxers.texi	lavf: add SBG demuxer.	2011-12-15 18:38:06 +01:00
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	doc: add a list of errno codes on some systems.	2011-12-21 19:59:45 +01:00
eval.texi	Merge remote-tracking branch 'qatar/master'	2012-07-04 21:03:28 +02:00
faq.texi	faq: explain dependency problems with static libs.	2012-07-20 11:40:26 +02:00
fate.texi	doc/fate: Rework examples to a section of its own	2012-07-05 10:55:49 +02:00
ffmpeg.texi	ffmpeg: add -(no)stdin option.	2012-07-19 16:33:02 +02:00
ffmpeg.txt	Fix "ouput" typo and add a check.	2012-01-28 11:04:19 +01:00
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	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
filter_design.txt	doc/filter_design: fix a few typos	2012-07-22 12:16:18 +02:00
filters.texi	src_movie: implement multiple outputs.	2012-07-23 17:14:59 +02:00
general.texi	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
git-howto.texi	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +02:00
git-howto.txt	githowto: git is generally available as package in most distros.	2011-11-23 23:03:37 +01:00
indevs.texi	doc/indevs/iec61883: document requirements for iec61883 device	2012-07-06 11:47:50 +02:00
issue_tracker.txt
Makefile	doc/Makefile: Add missing $(HOSTEXESUF) to print_options	2012-07-14 11:47:09 +02:00
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	lavd/caca: rename "colors" option to "color"	2012-07-22 10:31:33 +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-07-23 21:25:09 +02:00
rate_distortion.txt
RELEASE_NOTES	release_notes: update	2012-05-25 17:27:40 +02:00
snow.txt
soc.txt	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
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	doc: declare encoding for texi2html.	2012-07-22 12:48:57 +02:00
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