ffmpeg/doc
Michael Niedermayer f9a2d0c3fe Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  avconv: Reformat s16 volume adjustment.
  ARM: NEON optimised vector_fmac_scalar()
  dca: use vector_fmac_scalar from dsputil
  dsputil: add vector_fmac_scalar()
  latmenc: Fix private options
  vf_unsharp: store hsub/vsub in the filter context
  vf_unsharp: adopt a more natural order of params in apply_unsharp()
  vf_unsharp: rename method "unsharpen" to "apply_unsharp"
  vf_scale: apply the same transform to the aspect during init that is applied per frame
  vf_pad: fix "vsub" variable value computation
  vf_scale: add a "sar" variable
  lavfi: fix realloc size computation in avfilter_add_format()
  vsrc_color: use internal timebase
  lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
  graphparser: prefer void * over AVClass * for log contexts
  avfiltergraph: use meaningful error codes
  avconv: Initialize return value for codec copy path.
  fate: use 'run' helper for seek-test
  fate: remove seek-mpeg2reuse test
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  ...

Conflicts:
	doc/filters.texi
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/graphparser.c
	libavfilter/vf_scale.c
	libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 01:11:01 +02:00
..
examples
APIchanges lavu: add av_x_if_null(). 2011-09-22 00:22:52 +02:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-09-28 02:07:44 +02:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-09-28 02:07:44 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
encoders.texi doc: fix x264_opts/x264opts typo. 2011-09-16 11:50:06 +02:00
eval.texi eval: implement not() expression 2011-09-19 12:38:34 +02:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
fate.txt
ffmpeg-mt-authorship.txt
ffmpeg.texi doc/ffmpeg.texi: merge changes from avconv.texi since last merge 2011-09-28 03:19:22 +02:00
ffplay.texi ffplay.texi: document -codec 2011-09-27 22:00:20 +02:00
ffprobe.texi ffprobe: add JSON output printing format. 2011-09-13 23:03:05 +02:00
ffserver.conf
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
filters.texi Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
general.texi 2/4 bpp png is supported. 2011-09-28 22:53:25 +02:00
git-howto.txt
indevs.texi lavdev/lavfi: add audio support 2011-09-16 21:22:05 +02:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi Remove reference to the libavfilter soc SVN repo, update libavfilter status description 2011-09-10 23:40:52 +02:00
Makefile
metadata.texi
multithreading.txt
muxers.texi
optimization.txt
outdevs.texi
protocols.texi
rate_distortion.txt
RELEASE_NOTES
snow.txt
soc.txt
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt