1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/doc
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
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
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 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
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 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
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
print_options.c
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rate_distortion.txt
RELEASE_NOTES
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi
t2h.init doc: declare encoding for texi2html. 2012-07-22 12:48:57 +02:00
tablegen.txt
texi2pod.pl
viterbi.txt