1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/doc
Michael Niedermayer 56ae5926f7 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libopenjpeg: introduce encoding support
  libopenjpeg: rename decoder source file.
  RTMPTS protocol support
  RTMPS protocol support
  avconv: print an error message when demuxing fails.
  tscc2: DCT output should not be clipped
  rtmp: Rename rtmphttp to ffrtmphttp

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/libopenjpegenc.c
	libavcodec/version.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-18 01:27:19 +02:00
..
doxy
examples examples/filtering: fix packet memleak 2012-06-26 19:04:17 +02:00
APIchanges Merge remote-tracking branch 'qatar/master' 2012-07-16 01:32:52 +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
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 ffmpeg: add -progress option. 2012-07-14 14:51:18 +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
ffserver.texi
filter_design.txt lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
filters.texi doc/filters: Fix two typos 2012-07-16 14:01:01 +02:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-07-18 01:27:19 +02:00
git-howto.texi doc: Remove stray @item from git-howto 2012-07-13 11:51:06 -04: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 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-07-18 01:27:19 +02:00
rate_distortion.txt
RELEASE_NOTES release_notes: update 2012-05-25 17:27:40 +02:00
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi doc/syntax: escape '@' to fix a warning. 2012-05-29 07:40:58 +02:00
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt