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

…

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

…

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

…

doxy-wrapper.sh

doc/doxy-wrapper.sh: autodetect version

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

Doxyfile

…

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

…

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.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

…

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

…

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

…

mips.txt

…

multithreading.txt

…

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

…

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

…

scaler.texi

…

snow.txt

…

style.min.css

…

swresample.txt

…

swscale.txt

…

t2h.init

…

t2h.pm

stop embedding the build date

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

tablegen.txt

…

texi2pod.pl

…

texidep.pl

…

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