Michael Niedermayer b7ebb49d03 Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' ...

* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2':
  avconv: remove -same_quant

Conflicts:
	Changelog
	doc/faq.texi
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c

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

2012-10-10 13:51:07 +02:00

..

doxy

doc: support the new website layout

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

examples

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

APIchanges

Merge commit '78071a1420b425dfb787ac739048f523007b8139'

2012-10-08 19:42:49 +02:00

avtools-common-opts.texi

cmdutils: add -layouts option.

2012-08-28 15:09:49 +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 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

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

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

eval.texi

doc/eval: add missing documentation of functions

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

faq.texi

Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'

2012-10-10 13:51:07 +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

Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'

2012-10-10 13:51:07 +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 -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

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

doc: fix typos in filter documentation

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

filters.texi

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

general.texi

DTS-HD demuxer

2012-10-09 08:59:09 +00: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

lavd/dshow: support video codec and pixel format selection

2012-09-07 09:59:12 +02:00

issue_tracker.txt

doc: issue tracking: explain the term issue

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

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

metadata.texi

Revert "replace FFmpeg with Libav in doc/"

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

mips.txt

Optimization of AC3 floating point decoder for MIPS

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

multithreading.txt

Revert "replace FFmpeg with Libav in doc/"

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

muxers.texi

lavf/segment: add segment_list_flags option

2012-09-11 01:24:54 +02:00

nut.texi

doc: initial nut documentation

2012-10-08 11:22:42 +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

doc/platform: Rework the Visual Studio linking section

2012-09-28 16:35:49 -04: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

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

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

RELEASE_NOTES

doc/RELEASE_NOTES: update for the 9 release.

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

snow.txt

…

soc.txt

Merge remote-tracking branch 'qatar/master'

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

swresample.txt

doc/swresample.txt: fix typos

2012-10-02 09:43:27 +02: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

Merge remote-tracking branch 'qatar/master'

2012-10-09 13:06:04 +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