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

* qatar/master:
  doc/APIchanges: add an entry for codec descriptors.
  vorbisenc: set AVCodecContext.bit_rate to 0
  vorbisenc: fix quality parameter
  FATE: add ALAC encoding tests
  lpc: fix alignment of windowed samples for odd maximum LPC order
  alacenc: use s16p sample format as input
  alacenc: remove unneeded sample_fmt check
  alacenc: fix max_frame_size calculation for the final frame
  adpcm_swf: Use correct sample offsets when using trellis.
  rtmp: support strict rtmp servers
  mjpegdec: support AVRn interlaced
  x86: remove FASTDIV inline asm

Conflicts:
	doc/APIchanges
	libavcodec/mjpegdec.c
	libavcodec/vorbisenc.c
	libavutil/x86/intmath.h

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

2012-08-23 14:33:33 +02:00

..

doxy

…

examples

examples/decoding_encoding: flush audio frames in the encoder

2012-08-22 11:54:30 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-08-23 14:33:33 +02:00

avtools-common-opts.texi

Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

2012-08-20 17:06:50 +02:00

avutil.txt

…

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

…

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-17 17:06:52 +02:00

encoders.texi

doc/encoders: update libvpxenc mappings

2012-06-13 11:33:00 +02:00

errno.txt

…

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

doc/ffmpeg: extend documentation for -(no)stdin option

2012-08-21 10:04: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

…

filter_design.txt

filter_design: document ownership and permissions.

2012-08-14 12:12:20 +02:00

filters.texi

doc/filters: fix level for the flite Examples subsection

2012-08-22 01:21:20 +02:00

general.texi

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

git-howto.texi

Merge remote-tracking branch 'qatar/master'

2012-07-24 21:15:57 +02:00

git-howto.txt

…

indevs.texi

doc/indevs: document missing options in x11grab section

2012-08-08 23:43:37 +02:00

issue_tracker.txt

…

Makefile

doc/Makefile: add doc target, as an alias for "documentation"

2012-08-18 10:04:25 +02:00

metadata.texi

…

mips.txt

mips: change list of files with MIPS copyright notice in mips.txt

2012-08-17 18:54:50 +02:00

multithreading.txt

…

muxers.texi

doc/muxers: simplify segment examples

2012-08-18 12:32:54 +02:00

optimization.txt

…

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

Merge remote-tracking branch 'qatar/master'

2012-08-17 17:06:52 +02:00

rate_distortion.txt

…

RELEASE_NOTES

release_notes: update

2012-05-25 17:27:40 +02:00

snow.txt

…

soc.txt

…

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

…

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