Michael Niedermayer 50255b7a86 Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c' ...

* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
  cmdutils: Add a stream specifier to map usable streams

Conflicts:
	cmdutils.c

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

2015-03-20 20:15:40 +01:00

..

examples

Merge commit '990e4a6639d0714198583c2812b1074b5751898f'

2015-03-01 00:30:20 +01:00

APIchanges

doc/APIchanges: Fill in the xx

2015-03-06 16:39:50 +01:00

authors.texi

…

bitstream_filters.texi

doc: mention the noise_bsf parameter in the docs

2014-12-01 23:47:07 +01:00

bootstrap.min.css

doc: Copyright in CSS, CSS split in 2 files

2014-09-06 01:37:31 +02:00

build_system.txt

x86/doc/Makefile: DBG=1 to preprocess external asm

2015-02-17 13:08:04 +01:00

codecs.texi

doc/codecs: document nomc flag

2015-01-12 01:18:01 +01:00

decoders.texi

doc: Use the correct @subsection tag

2014-12-07 21:50:47 +01:00

default.css

doc: restore default.css

2014-07-20 02:01:50 +02:00

demuxers.texi

doc: add entry for APNG demuxer where needed.

2014-11-25 18:28:32 +01:00

developer.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

devices.texi

doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all

2014-01-09 12:12:10 +01:00

doxy-wrapper.sh

doc/doxy-wrapper.sh: autodetect version

2015-02-02 05:04:14 +01:00

Doxyfile

doc/Doxyfile: use 5 columns for alphabetical index

2014-07-08 00:43:18 +02:00

encoders.texi

doc: fix typos

2015-01-07 17:17:33 -09:00

errno.txt

…

faq.texi

doc: avoid the incorrect phrase 'allow to'

2015-03-08 21:59:28 +01:00

fate_config.sh.template

Merge remote-tracking branch 'qatar/master'

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

fate.texi

doc: fate: remove outdated SSH key fingerprint

2015-03-16 11:55:47 +01:00

ffmpeg-bitstream-filters.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-codecs.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-devices.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-filters.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-formats.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-protocols.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-resampler.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-scaler.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg-utils.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffmpeg.texi

doc: Improve video creation examples (from image2).

2015-03-09 10:49:59 +01:00

ffmpeg.txt

…

ffplay.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffprobe.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

ffprobe.xsd

Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

2015-03-08 23:58:18 +01:00

ffserver.conf

ffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress

2014-08-17 22:51:45 -04:00

ffserver.texi

doc: avoid the incorrect phrase 'allow to'

2015-03-08 21:59:28 +01:00

fftools-common-opts.texi

Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'

2015-03-20 20:15:40 +01:00

filter_design.txt

doc/filter_design.txt: Fix duplicate words

2013-08-12 19:40:29 +02:00

filters.texi

lavfi/eq: rework expression evaluation

2015-03-20 09:41:32 +01:00

formats.texi

doc: avoid the incorrect phrase 'allow to'

2015-03-08 21:59:28 +01:00

general.texi

Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'

2015-03-15 22:18:41 +01:00

git-howto.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

indevs.texi

doc: Fix alphabetic ordering for decklink input device.

2015-03-13 01:57:42 +01:00

issue_tracker.txt

doc/issue_tracker: Correct sub-domain for mailing list

2014-07-20 20:57:53 +02:00

libavcodec.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

libavdevice.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

libavfilter.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

libavformat.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

libavutil.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

libswresample.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

libswscale.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

Makefile

Merge commit '990e4a6639d0714198583c2812b1074b5751898f'

2015-03-01 00:30:20 +01: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/image2: remove the non-negative number requirement for start_number

2015-02-04 13:17:30 +01:00

nut.texi

doc: set documentencoding on toplevel texi files.

2015-02-19 11:30:30 +01:00

optimization.txt

x86/doc/Makefile: DBG=1 to preprocess external asm

2015-02-17 13:08:04 +01:00

outdevs.texi

ffmpeg: add -devices param

2014-05-28 03:52:50 +02:00

platform.texi

Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'

2015-02-21 12:08:31 +01:00

print_options.c

doc: fix spelling errors

2014-12-01 00:31:06 +01:00

protocols.texi

doc/protocols: Fixed missing example section marker

2015-03-17 15:04:22 +01:00

rate_distortion.txt

…

resampler.texi

doc: add a few links to the Channel Layout syntax section

2013-10-25 15:44:12 +02:00

scaler.texi

swscale: add two spatially stable dithering methods

2014-03-25 13:48:06 +01:00

snow.txt

doc/snow: remove possibly wrong todo item

2014-08-26 01:19:26 +02:00

style.min.css

doc: Copyright in CSS, CSS split in 2 files

2014-09-06 01:37:31 +02:00

swresample.txt

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

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

swscale.txt

…

t2h.init

doc: Copyright in CSS, CSS split in 2 files

2014-09-06 01:37:31 +02:00

t2h.pm

stop embedding the build date

2015-02-02 05:04:14 +01:00

tablegen.txt

…

texi2pod.pl

Merge commit '94f084324e648876508bed546d950762f10b875e'

2014-09-03 12:24:47 +02:00

texidep.pl

doc: add script to compute texi files dependencies

2013-12-06 10:40:38 +01:00

utils.texi

doc: avoid the incorrect phrase 'allow to'

2015-03-08 21:59:28 +01:00

writing_filters.txt

doc/writing_filters: use ffmpeg.org instead of wikimedia.org for lena image

2014-11-19 19:55:02 +01:00