Michael Niedermayer e3a91c51f7 Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4' ...

* commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4':
  rtpdec: Don't pass a non-AVClass pointer as log context
  rtsp: Update a comment to the current filename scheme
  avcodec: handle AVERROR_EXPERIMENTAL
  avutil: Add AVERROR_EXPERIMENTAL
  avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/utils.c
	libavformat/rtpdec.c
	libavutil/error.c
	libavutil/error.h
	libavutil/version.h

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

2012-10-22 14:39:12 +02:00

..

doxy

doc: support the new website layout

2012-10-08 11:22:42 +02:00

examples

examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame

2012-10-20 19:42:55 +02:00

APIchanges

Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'

2012-10-22 14:39:12 +02:00

avtools-common-opts.texi

cmdutils: add -layouts option.

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

avutil.txt

…

bitstream_filters.texi

…

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

…

errno.txt

…

eval.texi

doc/eval: add missing documentation of functions

2012-08-22 01:03:48 +02:00

faq.texi

Merge commit '0a75d1da23b8659ec49391469bb592da12760077'

2012-10-12 14:15:33 +02:00

fate_config.sh.template

doc/fate: Move fate config example into doc subdirectory

2012-09-29 19:27:01 +02:00

fate.texi

doc/fate: Move fate config example into doc subdirectory

2012-09-29 19:27:01 +02:00

ffmpeg.texi

docu: fix flite example

2012-10-15 11:24:08 -06:00

ffmpeg.txt

…

ffplay.texi

…

ffprobe.texi

ffprobe: add -select_streams option

2012-10-05 23:58:18 +02:00

ffprobe.xsd

ffprobe: extend disposition printing support

2012-09-30 12:22:19 +02:00

ffserver.conf

…

ffserver.texi

…

filter_design.txt

doc: fix typos in filter documentation

2012-09-18 09:06:44 +02:00

filters.texi

lavfi/aspect: add max option

2012-10-22 10:46:43 +02:00

general.texi

lavc: add xface image decoder and encoder

2012-10-15 08:32:18 +02:00

git-howto.texi

…

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

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +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

doc/muxers: document mov faststart option.

2012-10-21 20:23:09 +02:00

nut.texi

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

2012-10-14 14:46:13 +02:00

optimization.txt

…

outdevs.texi

…

platform.texi

doc/platform: Add info on shared builds with MSVC

2012-10-20 13:00:12 -04:00

print_options.c

…

protocols.texi

Document tcp proto 'timeout' parameter behavior

2012-09-15 16:26:00 +02:00

rate_distortion.txt

…

RELEASE_NOTES

doc/RELEASE_NOTES: update for the 9 release.

2012-10-06 13:55:18 +02:00

snow.txt

…

soc.txt

…

swresample.txt

doc/swresample.txt: fix typos

2012-10-02 09:43:27 +02:00

swscale.txt

…

syntax.texi

…

t2h.init

Merge remote-tracking branch 'qatar/master'

2012-10-09 13:06:04 +02:00

tablegen.txt

…

texi2pod.pl

doc/texi2pod: add "use warnings" directive

2012-08-12 23:52:55 +02:00

viterbi.txt

…