ffmpeg/doc
Michael Niedermayer bbb61a1cd5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  als: prevent infinite loop in zero_remaining().
  cook: prevent div-by-zero if channels is zero.
  pamenc: switch to encode2().
  svq1enc: switch to encode2().
  dvenc: switch to encode2().
  dpxenc: switch to encode2().
  pngenc: switch to encode2().
  v210enc: switch to encode2().
  xwdenc: switch to encode2().
  ttadec: use branchless unsigned-to-signed unfolding
  avcodec: add a Sun Rasterfile encoder
  sunrast: Move common defines to a new header file.
  cdxl: fix video decoding for some files
  cdxl: fix audio for some samples
  apetag: add proper support for binary tags
  ttadec: remove dead code
  swscale: make access to filter data conditional on filter type.
  swscale: update context offsets after removal of AlpMmxFilter.
  prores: initialise encoder and decoder parts only when needed
  swscale: make monowhite/black RGB-independent.
  ...

Conflicts:
	Changelog
	libavcodec/alsdec.c
	libavcodec/dpxenc.c
	libavcodec/golomb.h
	libavcodec/pamenc.c
	libavcodec/pngenc.c
	libavformat/img2.c
	libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-18 02:20:19 +01:00
..
doxy
examples
APIchanges lavu: add timestamp.h header with convenience timestamp utilities 2012-02-09 18:37:58 +01:00
Makefile
RELEASE_NOTES
avtools-common-opts.texi
avutil.txt
bitstream_filters.texi
build_system.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
decoders.texi
demuxers.texi
developer.texi
encoders.texi
errno.txt
eval.texi
faq.texi
fate.texi Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi ffmpeg.c: implement -debug_ts option 2012-02-14 18:01:37 +01:00
ffmpeg.txt
ffplay.texi
ffprobe.texi ffprobe: add count_frames and count_packets options 2012-02-17 01:06:43 +01:00
ffprobe.xsd ffprobe: add count_frames and count_packets options 2012-02-17 01:06:43 +01:00
ffserver.conf Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
ffserver.texi
filters.texi Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
git-howto.texi
git-howto.txt
indevs.texi
issue_tracker.txt
libavfilter.texi
metadata.texi
multithreading.txt
muxers.texi doc: fix convertion tool references 2012-02-01 03:37:08 +01:00
optimization.txt
outdevs.texi
platform.texi
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-02-15 01:52:14 +01:00
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00