1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/doc
Michael Niedermayer 5743095ca9 Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'
* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
  avconv: print an error on applying options of the wrong type.
  atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
  output-example: Update to use encode_video2 instead of the now dropped encode_video

Conflicts:
	doc/examples/muxing.c
	ffmpeg_opt.c
	libavutil/atomic.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 18:10:35 +01:00
..
doxy
examples Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38' 2013-03-12 18:10:35 +01:00
APIchanges Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111' 2013-03-12 15:35:39 +01:00
authors.texi doc: use a common authors.texi file blurb 2012-12-19 09:33:43 +01:00
avtools-common-opts.texi doc: remove inclusion of libav* documentation in tools 2012-12-20 23:48:23 +01:00
avutil.txt
bitstream_filters.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
build_system.txt
decoders.texi doc/decoders: fix typo in "@Options" 2012-12-06 10:16:10 +01:00
default.css doc/default.css: use ffmpeg.org website CSS 2012-12-22 00:38:48 +01:00
demuxers.texi lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
developer.texi Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608' 2013-02-24 14:32:55 +01:00
doxy-wrapper.sh
Doxyfile Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
encoders.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
errno.txt
eval.texi eval: print() support 2013-02-17 17:36:27 +01:00
faq.texi doc/faq: fill missing word in the concat protocol entry 2013-01-25 00:04:22 +01:00
fate_config.sh.template
fate.texi
ffmpeg-bitstream-filters.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-codecs.texi doc/codecs: simple sub_charenc option documentation. 2013-02-17 16:58:19 +01:00
ffmpeg-devices.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-filters.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-formats.texi lavf: clarify/extend documentation for AVFormatContext::analyzeduration 2013-01-13 15:09:09 +01:00
ffmpeg-protocols.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-resampler.texi doc/resampler: fix two typo. 2013-02-14 23:43:08 +01:00
ffmpeg-scaler.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-utils.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg.texi ffmpeg: add the -canvas_size option. 2013-03-10 13:48:49 +01:00
ffmpeg.txt
ffplay.texi doc/ffplay,ffmpeg: mention the corresponding negated option for -stats 2013-03-10 13:22:59 +01:00
ffprobe.texi doc: fix reference to ffmpeg-bitstream-filters.html page 2013-02-15 18:56:27 +01:00
ffprobe.xsd ffprobe: show pkt_size in frame 2012-12-15 11:46:47 +01:00
ffserver.conf
ffserver.texi doc: fix reference to ffmpeg-bitstream-filters.html page 2013-02-15 18:56:27 +01:00
filter_design.txt doc: update filter_design.txt to API changes. 2013-02-02 19:16:11 +01:00
filters.texi lavfi/smartblur: add support to named options 2013-03-10 16:38:45 +01:00
general.texi EVRC decoder 2013-01-21 10:24:45 +00:00
git-howto.texi
git-howto.txt
indevs.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
issue_tracker.txt
libavcodec.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavdevice.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavfilter.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavformat.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavutil.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libswresample.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libswscale.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
Makefile Merge commit '7a95afe433b2a692f490b98948c082e62ffc1d27' 2013-01-24 14:35:15 +01:00
metadata.texi
mips.txt
multithreading.txt Merge commit '759001c534287a96dc96d1e274665feb7059145d' 2013-03-12 03:23:28 +01:00
muxers.texi lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
nut.texi Drop Snow codec 2013-01-06 16:30:02 +01:00
optimization.txt Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
outdevs.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
platform.texi doc/platform: Fix 10l typo 2013-02-13 18:41:37 -05:00
print_options.c
protocols.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
rate_distortion.txt miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
RELEASE_NOTES Merge commit 'b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a' 2013-01-05 13:27:59 +01:00
snow.txt Drop Snow codec 2013-01-06 16:30:02 +01:00
soc.txt
swresample.txt Fix a few "its" vs "it's" typo. 2013-02-14 23:45:48 +01:00
swscale.txt
syntax.texi lavu/parseutils: allow MM:SS format for duration in av_parse_time() 2013-02-22 23:43:46 +01:00
t2h.init Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568' 2013-01-27 13:32:56 +01:00
tablegen.txt
texi2pod.pl doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields 2013-03-07 01:44:59 +01:00
viterbi.txt miscellaneous typo fixes 2012-12-21 00:18:34 +01:00