ffmpeg/doc
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
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
Doxyfile doxygen: dont strip code comments 2013-03-31 22:34:13 +02:00
Makefile doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
RELEASE_NOTES doc: update release_notes by taking the ones from release/1.2 2013-03-19 16:21:26 +01:00
authors.texi
avtools-common-opts.texi doc: document -opencl_options option in ff* tools manuals 2013-04-14 20:30:34 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
codecs.texi doc: move ffmpeg-codecs.texi content to separated file 2013-04-05 10:11:57 +02:00
decoders.texi
default.css
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
encoders.texi doc/encoders: Clarify that there are 2 prores encoders 2013-04-11 23:13:34 +02:00
errno.txt
faq.texi lavfi: deprecate aconvert. 2013-04-11 22:13:45 +02:00
fate.texi doc/fate.texi: fix typo 2013-04-03 21:07:15 +02:00
fate_config.sh.template
ffmpeg-bitstream-filters.texi
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
ffmpeg-formats.texi doc: move ffmpeg-formats.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-protocols.texi
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
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
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
git-howto.txt
indevs.texi doc: Consistently use 'frame rate' everywhere 2013-03-31 18:22:08 -04:00
issue_tracker.txt
libavcodec.texi
libavdevice.texi
libavfilter.texi
libavformat.texi
libavutil.texi doc/libavutil: remove include of opencl.texi 2013-04-12 18:21:57 +02:00
libswresample.texi
libswscale.texi
metadata.texi
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
optimization.txt
outdevs.texi
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
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
soc.txt
swresample.txt
swscale.txt
t2h.init
tablegen.txt
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