Michael Niedermayer 9765caec1b Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

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

2011-09-12 21:01:12 +02:00

..

examples

examples/muxing.c: apply misc style fixes

2011-07-27 02:05:49 +02:00

APIchanges

lavfi: simplify signature for avfilter_get_audio_buffer() and friends

2011-09-12 18:51:18 +02:00

avconv.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 21:01:12 +02:00

avtools-common-opts.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

avutil.txt

Remove unused softfloat implementation.

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

bitstream_filters.texi

Revert "replace FFmpeg with Libav in doc/"

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

build_system.txt

Revert some silly renamings that leaked in from a pull.

2011-03-29 02:27:13 +02:00

decoders.texi

decoders.texi: fix typos in rawvideo section

2011-05-20 10:14:00 +02:00

demuxers.texi

Rename ffplay to avplay.

2011-08-09 19:56:21 +02:00

developer.texi

developer.texi: Suggest a git clone if the patch review process doesnt work out

2011-08-23 04:34:14 +02:00

encoders.texi

doc: cosmetics: libx264 typos

2011-06-02 14:43:29 +02:00

eval.texi

eval: add support for pow() function

2011-06-07 00:37:00 +02:00

faq.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

fate.txt

fate.txt: replace FATE rsync command with a make command

2011-05-27 10:41:46 +02: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'

2011-09-12 00:32:54 +02:00

ffplay.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

ffprobe.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

ffserver.conf

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

ffserver.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

filters.texi

lavfi: add showinfo filter

2011-09-12 08:48:14 +02:00

general.texi

Merge remote-tracking branch 'qatar/master'

2011-09-07 22:58:39 +02:00

git-howto.txt

fix typo

2011-04-10 04:31:54 +02:00

indevs.texi

indevs.texi: fix typo (builf -> build)

2011-08-11 17:32:54 +02:00

issue_tracker.txt

doc: issue tracking: explain the term issue

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

libavfilter.texi

Remove reference to the libavfilter soc SVN repo, update libavfilter status description

2011-09-10 23:40:52 +02:00

Makefile

build: create output directories as needed

2011-06-29 09:14:56 +01: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

Merge remote-tracking branch 'qatar/master'

2011-07-10 04:28:50 +02:00

optimization.txt

fix another forgotten mplayerhq.hu link

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

outdevs.texi

sdl: use the filename for defining the window title, if not specified

2011-06-05 13:17:38 +02:00

protocols.texi

Rename ffplay to avplay.

2011-08-09 19:56:21 +02:00

rate_distortion.txt

…

RELEASE_NOTES

release_notes: document not fully understood mingw-sdl issue

2011-06-21 20:58:39 +02:00

snow.txt

…

soc.txt

Revert "replace FFmpeg with Libav in doc/"

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

swscale.txt

…

t2h.init

doc: modify style for texi2html 1.78+

2011-01-30 03:41:47 +01:00

tablegen.txt

…

texi2pod.pl

doc: replace @pxref by @ref where appropriate

2011-07-09 21:53:59 +02:00

viterbi.txt

…