Michael Niedermayer 7cbef2ed7e Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e' ...

* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c

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

2013-08-06 11:39:09 +02:00

..

doxy

doc: support the new website layout

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

examples

doc/examples/filtering_audio: make const arrays also static

2013-08-03 22:22:03 +02:00

APIchanges

Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

2013-08-03 10:48:11 +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/bitstream_filters: document dump_extra

2013-07-17 09:31:02 +02:00

build_system.txt

cosmetics: Delete empty lines at end of file.

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

codecs.texi

doc/codecs: fix dangling reference to codec-options chapter

2013-07-27 16:50:19 +02:00

decoders.texi

doc/decoders: document libopus decoder

2013-06-28 13:09:10 +02:00

default.css

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

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

demuxers.texi

mpegts: add fix_teletext_pts mpegts demuxer option

2013-08-06 02:47:38 +02:00

developer.texi

Merge remote-tracking branch 'qatar/master'

2013-07-28 14:21:11 +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

Update back for git master

2013-07-10 03:14:23 +02:00

encoders.texi

libxvid: Add SSIM displaying through a libxvidcore plugin

2013-07-31 12:41:27 +02:00

errno.txt

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

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

faq.texi

Merge remote-tracking branch 'qatar/master'

2013-07-26 11:12:11 +02:00

fate_config.sh.template

Merge remote-tracking branch 'qatar/master'

2013-05-29 11:19:25 +02:00

fate.texi

Merge remote-tracking branch 'qatar/master'

2013-07-28 14:21:11 +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 '811bd0784679dfcb4ed02043a37c92f9df10500e'

2013-08-06 11:39:09 +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

ffprobe: add -show_programs option

2013-07-28 16:39:06 +02:00

ffprobe.xsd

ffprobe: add -show_programs option

2013-07-28 16:39:06 +02: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

vf_scale: add force_original_aspect_ratio

2013-08-04 13:27:01 +02:00

formats.texi

doc/formats: add section describing stream specifiers

2013-07-11 00:35:35 +02:00

general.texi

Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'

2013-07-30 11:26:39 +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

v4l2: make possible to disable libv4l2 at runtime.

2013-05-22 19:49:29 +02:00

issue_tracker.txt

update all trac links to use the trac subdomain

2013-06-29 19:27:49 +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

Revert "doc: add script to compute texi files dependencies"

2013-07-03 12:59:59 +02:00

metadata.texi

doc/metadata: add notes and examples regarding metadata usage with ffmpeg

2013-06-11 01:07:16 +02:00

mips.txt

libavcodec: Implementation of 32 bit fixed point FFT

2013-08-04 14:01:41 +02:00

multithreading.txt

Merge commit '759001c534287a96dc96d1e274665feb7059145d'

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

muxers.texi

doc/muxers: Document use case of mpegts muxer option tables_version

2013-08-04 13:35:54 +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

lavd: add xv output device

2013-05-30 10:44:54 +02:00

platform.texi

Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

2013-06-25 10:46:52 +02:00

print_options.c

Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

2013-08-03 09:22:30 +02:00

protocols.texi

doc/protocols: Document file protocol options

2013-08-01 04:08:14 +02:00

rate_distortion.txt

miscellaneous typo fixes

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

RELEASE_NOTES

Update for 2.0

2013-07-10 02:15:43 +02:00

resampler.texi

doc: add "rematrix_maxval"

2013-07-22 03:37:55 +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

…

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