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

* qatar/master:
  rtmp: Add support for SWFVerification
  api-example: use new video encoding API.
  x86: avcodec: Appropriately name files containing only init functions
  mpegvideo_mmx_template: drop some commented-out cruft
  libavresample: add mix level normalization option
  w32pthreads: Add missing #includes to make header compile standalone
  rtmp: Gracefully ignore _checkbw errors by tracking them
  rtmp: Do not send _checkbw calls as notifications
  prores: interlaced ProRes encoding

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/proresenc_kostya.c
	libavcodec/w32pthreads.h
	libavcodec/x86/Makefile
	libavformat/version.h

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

2012-08-15 15:55:24 +02:00

..

doxy

doxygen: cleanup style to support older doxy

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

examples

Merge remote-tracking branch 'qatar/master'

2012-08-15 15:55:24 +02:00

APIchanges

lavfi: add avfilter_get_class() and iteration callbacks

2012-08-13 00:04:06 +02:00

avtools-common-opts.texi

doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section

2012-07-20 12:56:28 +02:00

avutil.txt

Remove unused softfloat implementation.

2011-05-11 13:43:30 +02:00

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

lavc: add ffwavesynth pseudo-codec.

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

demuxers.texi

lavf/img2dec: add and document pattern_type option

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

developer.texi

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

encoders.texi

doc/encoders: update libvpxenc mappings

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

errno.txt

doc: add a list of errno codes on some systems.

2011-12-21 19:59:45 +01:00

eval.texi

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

faq.texi

faq: suggest the concat filter.

2012-07-28 18:16:55 +02:00

fate.texi

doc/fate: Rework examples to a section of its own

2012-07-05 10:55:49 +02:00

ffmpeg.texi

ffmpeg: add an option to fix subtitles durations.

2012-08-14 11:17:45 +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

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

filter_design.txt

filter_design: document ownership and permissions.

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

filters.texi

lavfi: add hue filter

2012-08-13 12:00:54 +02:00

general.texi

Add ICO muxer

2012-08-14 16:54:25 +02:00

git-howto.texi

Merge remote-tracking branch 'qatar/master'

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

git-howto.txt

githowto: git is generally available as package in most distros.

2011-11-23 23:03:37 +01:00

indevs.texi

doc/indevs: document missing options in x11grab section

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

issue_tracker.txt

doc: issue tracking: explain the term issue

2011-09-02 23:08:03 +02:00

Makefile

build: extend documentation building mechanism

2012-08-13 12:22:02 +02:00

metadata.texi

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

mips.txt

doc: add documentation regarding MIPS optimizations

2012-07-03 22:06:10 +02:00

multithreading.txt

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

muxers.texi

Add ICO muxer

2012-08-14 16:54:25 +02:00

optimization.txt

fix another forgotten mplayerhq.hu link

2011-04-08 01:35:43 +02:00

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-15 15:55:24 +02:00

rate_distortion.txt

The definition of rate and distortion is not conditional of lambda being

2009-03-30 10:39:20 +00:00

RELEASE_NOTES

release_notes: update

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

snow.txt

Use a consistent capitalization for 'Snow' as discussed on the list

2008-02-08 19:17:46 +00:00

soc.txt

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

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

Update tablegen documentation for WRITE_ARRAY macro.

2010-06-27 14:31:50 +00:00

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