1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
FFmpeg/doc
Michael Niedermayer 612122b187 Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
  10-bit H.264 x86 chroma v loopfilter asm
  Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
  Fix crash of interlaced MPEG2 decoding
  h264pred: fix one more aliasing violation.
  doc/APIchanges: fill in missing hashes and dates.
  flacenc: use proper initializers for AVOption default values.
  lavc: deprecate named constants for deprecated antialias_algo.
  aac: workaround for compilation on cygwin
  swscale: extend YUV422p support to 10bits depth
  tiff: add support for inverted FillOrder for uncompressed data
  Remove unused softfloat implementation.
  h264pred: fix aliasing violations.
  rotozoom: Eliminate French variable name.
  rotozoom: Check return value of fread().
  rotozoom: Return an error value instead of calling exit().
  rotozoom: Make init_demo() return int and check for errors on invocation.
  rotozoom: Drop silly UINT8 typedef.
  rotozoom: Drop some unnecessary parentheses.
  rotozoom: K&R coding style cosmetics
  rtsp: Only do keepalive using GET_PARAMETER if the server supports it
  ...

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	doc/general.texi
	ffmpeg.c
	ffplay.c
	libavcodec/h264pred_template.c
	libavcodec/resample.c
	libavutil/pixfmt.h
	libavutil/softfloat.c
	libavutil/softfloat.h
	tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-12 04:51:24 +02:00
..
APIchanges Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
bitstream_filters.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
build_system.txt Revert some silly renamings that leaked in from a pull. 2011-03-29 02:27:13 +02:00
demuxers.texi Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
developer.texi developer.texi: update for git 2011-05-09 04:13:55 +02:00
encoders.texi Merge remote branch 'qatar/master' 2011-05-02 03:45:58 +02:00
eval.texi eval: add sqrt function for computing the square root 2011-05-05 18:38:35 +02:00
faq.texi Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
fate.txt Merge remote branch 'qatar/master' 2011-05-02 03:45:58 +02:00
ffmpeg-mt-authorship.txt Include authorship information from ffmpeg-mt at Ronald S. Bultjes request. 2011-04-19 01:17:59 +02:00
ffmpeg.texi documentation: extend documentation for ffmpeg -aspect option 2011-04-26 09:08:27 +02:00
ffplay.texi Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffprobe.texi Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.conf Update the url to the site website and change ffmpeg-devel to libav-devel 2011-03-13 18:45:29 -04:00
ffserver.texi Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
fftools-common-opts.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
filters.texi drawtext: add documentation for the shadow parameters 2011-05-07 10:21:56 +02:00
general.texi Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
git-howto.txt fix typo 2011-04-10 04:31:54 +02:00
indevs.texi Merge remote-tracking branch 'newdev/master' 2011-03-29 02:46:11 +02:00
issue_tracker.txt doc:Partial update of our issue tracker doc. More work needed, volunteers welcome. 2011-05-09 04:13:55 +02:00
libavfilter.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
metadata.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
multithreading.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
muxers.texi 10l, commit that should have been stashed into the merge. 2011-04-17 23:59:00 +02:00
optimization.txt fix another forgotten mplayerhq.hu link 2011-04-08 01:35:43 +02:00
outdevs.texi Merge remote-tracking branch 'newdev/master' 2011-03-28 01:50:36 +02:00
protocols.texi Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
rate_distortion.txt
snow.txt
soc.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
swscale.txt
t2h.init doc: modify style for texi2html 1.78+ 2011-01-30 03:41:47 +01:00
tablegen.txt
texi2pod.pl support @heading, @subheading, @subsubheading, and @subsubsection in 2011-03-25 09:48:31 -04:00
TODO Documentation updates for the git migration 2011-02-09 03:33:54 +01:00
viterbi.txt