Michael Niedermayer c065255bba Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-01-29 00:34:59 +01:00

..

doxy

doxygen: cleanup style to support older doxy

2011-12-29 17:19:46 +01:00

examples

example: Update decoding/encoding example to the new API.

2012-01-28 19:47:53 +01:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

avtools-common-opts.texi

Merge remote-tracking branch 'qatar/master'

2012-01-12 01:10:32 +01:00

avutil.txt

…

bitstream_filters.texi

doc/bistream_filters.texi: add documentation for the h264_mp4toannexb filter

2012-01-14 12:36:41 +01:00

build_system.txt

…

decoders.texi

lavc: add ffwavesynth pseudo-codec.

2011-12-15 18:38:04 +01:00

demuxers.texi

lavf: add SBG demuxer.

2011-12-15 18:38:06 +01:00

developer.texi

doc: make developer.texi point to correct fate doc

2011-12-20 18:12:36 +01:00

encoders.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01: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.texi: add precisation about the assumption for "trueness" in conditional expressions

2012-01-17 12:03:30 +01:00

faq.texi

faq: fix typo.

2012-01-24 16:03:09 +01:00

fate.texi

doc: fate: Move documentation from .txt to .texi

2011-12-20 16:05:01 +01:00

ffmpeg-mt-authorship.txt

…

ffmpeg.texi

Add -vsync drop.

2012-01-28 22:01:09 +01:00

ffmpeg.txt

Fix "ouput" typo and add a check.

2012-01-28 11:04:19 +01:00

ffplay.texi

ffplay: add 10 minute seek support to ffplay

2011-12-14 21:09:08 +01:00

ffprobe.texi

doc: remove trailing 's' to metadata.

2012-01-26 13:06:22 +01:00

ffprobe.xsd

ffprobe: add support to audio frame information printing

2012-01-12 17:34:16 +01:00

ffserver.conf

…

ffserver.texi

…

filters.texi

pan: add channel mapping capability.

2012-01-24 10:43:41 +01:00

general.texi

r210, r10k and avrp encoder

2012-01-25 23:40:06 +01:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

Merge remote-tracking branch 'qatar/master'

2012-01-05 02:03:12 +01:00

issue_tracker.txt

…

libavfilter.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

Makefile

doc: build: TEXIDEP: Recognize verbatim includes

2011-12-24 02:56:52 +01:00

metadata.texi

…

multithreading.txt

…

muxers.texi

Merge remote-tracking branch 'qatar/master'

2011-12-20 04:12:09 +01:00

optimization.txt

…

outdevs.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

platform.texi

Fix a bunch of platform name and other typos.

2012-01-11 13:48:30 +01:00

protocols.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

rate_distortion.txt

…

RELEASE_NOTES

RELEASE_NOTES: update for 0.10

2012-01-26 21:59:09 +01:00

snow.txt

…

soc.txt

…

swresample.txt

…

swscale.txt

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

…

viterbi.txt

…