Michael Niedermayer 42f5fc716e Merge commit '481575d255195c6c2f32e04686b94de984ae78d4' ...

* commit '481575d255195c6c2f32e04686b94de984ae78d4':
  avconv: remove -deinterlace

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

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.

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

2013-05-08 12:07:56 +02:00

..

doxy

doc: support the new website layout

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

examples

examples/filtering_audio: fix frame leak.

2013-04-18 17:03:01 +02:00

APIchanges

Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'

2013-05-03 12:15:01 +02:00

authors.texi

doc: use a common authors.texi file blurb

2012-12-19 09:33:43 +01:00

avtools-common-opts.texi

doc: document -opencl_options option in ff* tools manuals

2013-04-14 20:30:34 +02:00

avutil.txt

Remove unused softfloat implementation.

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

bitstream_filters.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-18 13:04:29 +01:00

build_system.txt

cosmetics: Delete empty lines at end of file.

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

codecs.texi

doc: move ffmpeg-codecs.texi content to separated file

2013-04-05 10:11:57 +02:00

decoders.texi

doc/decoders: fix typo in "@Options"

2012-12-06 10:16:10 +01:00

default.css

doc/default.css: use ffmpeg.org website CSS

2012-12-22 00:38:48 +01:00

demuxers.texi

lavf: add libquvi demuxer.

2013-04-10 12:09:20 +02:00

developer.texi

Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'

2013-05-05 10:47:19 +02:00

devices.texi

doc: move ffmpeg-devices.texi content to separated file

2013-04-05 10:11:57 +02:00

doxy-wrapper.sh

doc: add apidoc target for doxygen API documentation

2012-11-02 18:28:56 +01:00

Doxyfile

doxygen: dont strip code comments

2013-03-31 22:34:13 +02:00

encoders.texi

doc/encoders: Clarify that there are 2 prores encoders

2013-04-11 23:13:34 +02:00

errno.txt

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

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

faq.texi

lavfi: deprecate aconvert.

2013-04-11 22:13:45 +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.texi: fix typo

2013-04-03 21:07:15 +02:00

ffmpeg-bitstream-filters.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-codecs.texi

doc: move ffmpeg-codecs.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-devices.texi

doc: move ffmpeg-devices.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-filters.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-formats.texi

doc: move ffmpeg-formats.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-protocols.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-resampler.texi

doc: move ffmpeg-resampler.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-scaler.texi

doc: move ffmpeg-scaler.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-utils.texi

doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi

2013-04-12 18:21:57 +02:00

ffmpeg.texi

Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

2013-05-08 12:07:56 +02:00

ffmpeg.txt

Fix "ouput" typo and add a check.

2012-01-28 11:04:19 +01:00

ffplay.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

ffprobe.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

ffprobe.xsd

ffprobe: remove deprecated frame "reference" field

2013-03-17 00:27:48 +01:00

ffserver.conf

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

ffserver.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

filter_design.txt

doc: Consistently use 'frame rate' everywhere

2013-03-31 18:22:08 -04:00

filters.texi

doc/filters: document asetpts in single place

2013-05-03 18:22:29 +00:00

formats.texi

doc: move ffmpeg-formats.texi content to separated file

2013-04-05 10:11:57 +02:00

general.texi

JPEG 2000 decoder for DCinema

2013-04-22 15:38:29 +02:00

git-howto.texi

doc: git-howto: Leave reviewers time to react before pushing patches

2012-11-11 20:43:28 +01: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: Consistently use 'frame rate' everywhere

2013-03-31 18:22:08 -04:00

issue_tracker.txt

doc: issue tracking: explain the term issue

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

libavcodec.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavdevice.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavfilter.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavformat.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavutil.texi

doc/libavutil: remove include of opencl.texi

2013-04-12 18:21:57 +02:00

libswresample.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libswscale.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

Makefile

doc: enable compilation of -all tool pages

2013-04-05 10:11:57 +02:00

metadata.texi

Revert "replace FFmpeg with Libav in doc/"

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

mips.txt

mips: Optimization of AAC psychoacoustic model functions

2013-03-23 16:19:38 +01:00

multithreading.txt

Merge commit '759001c534287a96dc96d1e274665feb7059145d'

2013-03-12 03:23:28 +01:00

muxers.texi

Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'

2013-05-03 13:16:34 +02:00

nut.texi

Drop Snow codec

2013-01-06 16:30:02 +01:00

optimization.txt

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

outdevs.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-18 13:04:29 +01:00

platform.texi

Merge remote-tracking branch 'qatar/master'

2013-03-31 11:31:19 +02:00

print_options.c

Merge remote-tracking branch 'qatar/master'

2013-03-18 17:43:43 +01:00

protocols.texi

silly typo fixes

2013-05-03 18:26:12 +02:00

rate_distortion.txt

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

RELEASE_NOTES

doc: update release_notes by taking the ones from release/1.2

2013-03-19 16:21:26 +01:00

resampler.texi

doc: move ffmpeg-resampler.texi content to separated file

2013-04-05 10:11:57 +02:00

scaler.texi

doc: move ffmpeg-scaler.texi content to separated file

2013-04-05 10:11:57 +02:00

snow.txt

Drop Snow codec

2013-01-06 16:30:02 +01:00

soc.txt

Merge remote-tracking branch 'qatar/master'

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

swresample.txt

Fix a few "its" vs "it's" typo.

2013-02-14 23:45:48 +01:00

swscale.txt

x86: mmx2 ---> mmxext in comments and messages

2012-10-31 00:37:42 +01:00

t2h.init

Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568'

2013-01-27 13:32:56 +01:00

tablegen.txt

Update tablegen documentation for WRITE_ARRAY macro.

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

texi2pod.pl

doc/texi2pod.pl: skip printing chapter names if they are disabled

2013-03-30 16:58:45 +01:00

utils.texi

doc/utils: use @code markup for opencl function names.

2013-04-12 23:10:59 +02:00

viterbi.txt

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00