Michael Niedermayer 040a796dab Merge commit '755cd4197d53946208e042f095b930dca18d9430' ...

* commit '755cd4197d53946208e042f095b930dca18d9430':
  mov: enable parsing for VC-1.
  lavfi: Add fps filter.
  lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
  avconv: add support for audio in complex filtergraphs.

Conflicts:
	ffmpeg.c
	libavfilter/version.h
	libavformat/mov.c
	tests/ref/fate/vc1-ism

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

2012-05-19 20:31:24 +02:00

..

doxy

doxygen: cleanup style to support older doxy

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

examples

doc/examples: make use of the parameter filters_descr parameter in init_filters().

2012-05-19 12:29:05 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

avtools-common-opts.texi

Merge remote-tracking branch 'qatar/master'

2012-03-21 01:33:53 +01: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: add SBG demuxer.

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

developer.texi

build: Add 'check' target to run all compile and test targets.

2012-05-15 19:10:46 +02: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

eval: add root() to solve f(x)=0

2012-02-27 00:00:55 +01:00

faq.texi

faq: fix typo.

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

fate.texi

doc: fix link to fate.libav.org

2012-05-13 00:17:51 -07:00

ffmpeg-mt-authorship.txt

Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.

2011-04-19 01:17:59 +02:00

ffmpeg.texi

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02: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/ffprobe: fix rendering of the timecode chapter in the man page

2012-05-14 12:59:51 +02:00

ffprobe.xsd

ffprobe: report bit rate in stream description

2012-02-20 17:46:26 +01: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

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

filters.texi

Merge commit '755cd4197d53946208e042f095b930dca18d9430'

2012-05-19 20:31:24 +02:00

general.texi

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

git-howto.texi

Merge remote-tracking branch 'qatar/master'

2012-04-13 21:50:37 +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

v4l2: allow to convert monotonic timestamps.

2012-04-04 15:22:44 +02:00

issue_tracker.txt

doc: issue tracking: explain the term issue

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

libavfilter.texi

doc: use @command{} for commands.

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

Makefile

Merge remote-tracking branch 'qatar/master'

2012-03-29 04:11:10 +02:00

metadata.texi

Revert "replace FFmpeg with Libav in doc/"

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

multithreading.txt

Revert "replace FFmpeg with Libav in doc/"

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

muxers.texi

doc/muxers: add documentation for the md5 and framemd5 muxers

2012-04-07 13:57:40 +02:00

optimization.txt

fix another forgotten mplayerhq.hu link

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

outdevs.texi

doc: use @command{} for commands.

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

platform.texi

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

print_options.c

print_options: warn that the files are generated.

2012-04-23 18:14:25 +02:00

protocols.texi

doc: Replace some @file tags by more suitable markup.

2012-05-18 16:08:41 +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 for 0.10

2012-01-26 21:59:09 +01: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

t2h.init

Merge remote-tracking branch 'qatar/master'

2011-12-10 02:01:03 +01:00

tablegen.txt

Update tablegen documentation for WRITE_ARRAY macro.

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

texi2pod.pl

doc: texi2pod: add -I flag

2012-03-20 11:10:25 +00:00

viterbi.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00