Michael Niedermayer f276a490f0 Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' ...

* commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b':
  avformat: fix typo in avformat_close_input
  mp3enc: write Xing TOC
  mp3enc: support MPEG-2 and MPEG-2.5 in Xing header.
  mp3enc: downgrade some errors in writing Xing frame to warnings
  lavf: flush the output AVIOContext in av_write_trailer().
  lavf: cosmetics, reformat av_write_trailer().
  avio: flush the internal buffer in avio_close()
  Enhance doc on asyncts audiofilter
  cmdutils: avoid setting data pointers to invalid values in alloc_buffer()
  libavcodec: remove av_destruct_packet_nofree()

Conflicts:
	libavcodec/avpacket.c
	libavformat/mp3enc.c
	libavformat/nutenc.c
	libavformat/utils.c
	libavformat/version.h
	tests/ref/lavf/voc
	tests/ref/lavf/voc_s16

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

2012-09-16 14:24:11 +02:00

..

doxy

…

examples

examples/decoding_encoding: clarify operations in the usage message

2012-09-13 22:19:45 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

avtools-common-opts.texi

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

avutil.txt

…

bitstream_filters.texi

Merge remote-tracking branch 'qatar/master'

2012-02-25 04:00:43 +01:00

build_system.txt

…

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-30 17:28:21 +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

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

ffmpeg.txt

…

ffplay.texi

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

ffprobe.texi

ffprobe: add print_section option to the compact writer

2012-09-11 01:14:57 +02:00

ffprobe.xsd

ffprobe: print start_pts and duration_ts stream information

2012-09-12 10:22:29 +02:00

ffserver.conf

…

ffserver.texi

…

filter_design.txt

filter_design: document ownership and permissions.

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

filters.texi

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

general.texi

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

git-howto.texi

Merge remote-tracking branch 'qatar/master'

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

git-howto.txt

…

indevs.texi

lavd/dshow: support video codec and pixel format selection

2012-09-07 09:59:12 +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

Optimization of AC3 floating point decoder for MIPS

2012-09-05 20:09:56 +02:00

multithreading.txt

…

muxers.texi

lavf/segment: add segment_list_flags option

2012-09-11 01:24: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

Document tcp proto 'timeout' parameter behavior

2012-09-15 16:26:00 +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

…

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

…