generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
98298eb103
ffmpeg/doc
History
Michael Niedermayer 98298eb103 Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 
* commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5':
  x86: Fix linking with some or all of yasm, mmx, optimizations disabled
  configure: Add more fine-grained SSE CPU capabilities flags
  avfilter: x86: Use more precise compile template names
  x86: cosmetics: Comment some #endifs for better readability
  g723_1: add comfort noise generation
  utvideoenc: Switch to dsputils' median prediction
  utvideoenc: Avoid writing into the input picture
  avtools: remove the distinction between func_arg and func2_arg.
  avconv: make the -passlogfile option per-stream.
  avconv: make the -pass option per-stream.
  cmdutils: make -codecs print lossy/lossless flags.
  lavc: add lossy/lossless codec properties.

Conflicts:
	Changelog
	cmdutils.c
	configure
	doc/APIchanges
	ffmpeg.h
	ffmpeg_opt.c
	ffprobe.c
	libavcodec/codec_desc.c
	libavcodec/g723_1.c
	libavcodec/utvideoenc.c
	libavcodec/version.h
	libavcodec/x86/mpegaudiodec.c
	libavcodec/x86/rv40dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31 13:01:30 +02:00
..
doxy doxygen: cleanup style to support older doxy 2011-12-29 17:19:46 +01:00
examples examples/scaling_video: add logging in case of image allocation failure 2012-08-30 23:39:32 +02:00
APIchanges Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
avtools-common-opts.texi cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
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/img2dec: add and document pattern_type option 2012-08-08 23:43:36 +02:00
developer.texi Merge remote-tracking branch 'qatar/master' 2012-08-30 17:28:21 +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 doc/eval: add missing documentation of functions 2012-08-22 01:03:48 +02:00
faq.texi doc/faq: mention doc/examples 2012-08-22 01:03:49 +02:00
fate.texi doc/fate: Rework examples to a section of its own 2012-07-05 10:55:49 +02:00
ffmpeg.texi Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +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: fix validity error with tags and data. 2012-07-31 15:06:57 +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 filter_design: document ownership and permissions. 2012-08-14 12:12:20 +02:00
filters.texi lavfi: add smartblur filter 2012-08-28 19:48:16 +02:00
general.texi Add CPiA video decoder 2012-08-31 00:24:11 +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 dshow: allow user to specify audio buffer size 2012-08-29 18:58:20 +02:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
Makefile doc/Makefile: add doc target, as an alias for "documentation" 2012-08-18 10:04:25 +02:00
metadata.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
mips.txt mips: change list of files with MIPS copyright notice in mips.txt 2012-08-17 18:54:50 +02:00
multithreading.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
muxers.texi doc/muxers: simplify segment examples 2012-08-18 12:32:54 +02:00
optimization.txt fix another forgotten mplayerhq.hu link 2011-04-08 01:35:43 +02:00
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-08-10 16:25:23 +02:00
print_options.c print_options: warn that the files are generated. 2012-04-23 18:14:25 +02:00
protocols.texi Add 'timeout' option to UDP protocol 2012-08-29 00:28:07 +02:00
rate_distortion.txt The definition of rate and distortion is not conditional of lambda being 2009-03-30 10:39:20 +00:00
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 Update tablegen documentation for WRITE_ARRAY macro. 2010-06-27 14:31:50 +00:00
texi2pod.pl doc/texi2pod: add "use warnings" directive 2012-08-12 23:52:55 +02:00
viterbi.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00