Clément Bœsch bb7cc5b5d9 Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb' ...

* commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb':
  examples/output: switch to the new encoding API

This commit is a noop, our examples are different. Still, we need to
update them to the new API, so doc/libav-merge.txt is updated.

Merged-by: Clément Bœsch <u@pkh.me>

2017-03-21 14:54:07 +01:00

..

doxy

Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'

2016-06-22 11:28:51 +02:00

examples

Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'

2017-01-31 17:35:41 +01:00

.gitignore

Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'

2016-06-22 11:28:51 +02:00

APIchanges

avcodec, avformat: deprecate anything related to side data merging

2017-03-21 06:13:45 +01:00

authors.texi

…

bitstream_filters.texi

doc/bsfs: various improvements

2016-11-17 10:49:51 -09:00

bootstrap.min.css

…

build_system.txt

…

codecs.texi

doc: document cutoff option to ac3 and adjust the option's global documentation

2016-12-31 17:20:06 +01:00

decoders.texi

cosmetics: fix some misspelled words

2016-07-17 13:10:27 -03:00

default.css

…

demuxers.texi

doc: Add muxers/demuxers list option

2017-02-11 02:59:32 +01:00

developer.texi

doc/developer: Mention mime type and patchwork in "Submitting patches"

2016-10-11 23:20:56 +02:00

devices.texi

…

doxy-wrapper.sh

…

Doxyfile

doc: fix spelling errors

2016-10-21 23:58:47 +02:00

encoders.texi

doc/encoders: mention valid values for compression_level when using FLAC encoder

2017-03-03 13:49:26 -03:00

errno.txt

…

faq.texi

faq: use relative links to own documentation

2016-10-23 11:55:53 +02:00

fate_config.sh.template

…

fate.texi

Merge commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2'

2017-03-19 18:34:48 +01:00

ffmpeg-bitstream-filters.texi

…

ffmpeg-codecs.texi

…

ffmpeg-devices.texi

…

ffmpeg-filters.texi

…

ffmpeg-formats.texi

…

ffmpeg-protocols.texi

…

ffmpeg-resampler.texi

…

ffmpeg-scaler.texi

…

ffmpeg-utils.texi

…

ffmpeg.texi

doc/ffmpeg: document trailing "?" in map option

2017-02-13 15:26:43 -09:00

ffmpeg.txt

…

ffplay.texi

ffplay: allow borderless playback windows

2017-02-01 22:03:26 +01:00

ffprobe.texi

Avoid using the term "file" and prefer "url" in some docs and comments

2016-12-05 21:30:12 +01:00

ffprobe.xsd

lavf: add AV_DISPOSITION_TIMED_THUMBNAILS

2016-10-24 05:47:05 -05:00

ffserver.conf

lavc: remove libfaac wrapper

2016-10-01 19:58:04 +01:00

ffserver.texi

…

fftools-common-opts.texi

doc: Add muxers/demuxers list option

2017-02-11 02:59:32 +01:00

filter_design.txt

…

filters.texi

add signature filter for MPEG7 video signature

2017-03-21 00:11:08 +01:00

formats.texi

avformat: Add max_streams option

2016-12-08 18:25:30 +01:00

general.texi

avcodec: add XPM decoder and demuxer

2017-03-12 18:24:49 +01:00

git-howto.texi

Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

2016-06-21 21:55:34 +02:00

indevs.texi

doc: remove remaining legacy x11grab references

2017-03-15 22:23:00 +01:00

issue_tracker.txt

…

lexicon

doc: add a lexicon

2017-02-03 15:03:44 +01:00

libav-merge.txt

Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'

2017-03-21 14:54:07 +01:00

libavcodec.texi

…

libavdevice.texi

…

libavfilter.texi

…

libavformat.texi

…

libavutil.texi

…

libswresample.texi

…

libswscale.texi

…

Makefile

doc/examples: build http_multiclient example

2016-09-30 19:35:52 +02:00

metadata.texi

…

mips.txt

…

multithreading.txt

…

muxers.texi

doc/muxers: cleanup mpegts section

2017-03-16 12:01:15 -08:00

nut.texi

Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

2016-06-21 21:55:34 +02:00

optimization.txt

Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

2016-06-21 21:55:34 +02:00

outdevs.texi

avdevice/decklink_enc: add support to specify field order

2017-02-26 22:47:33 +01:00

patchwork

doc/patchwork: Document the patchwork states

2016-10-26 19:46:00 +02:00

platform.texi

doc: fix various typos and grammar errors

2016-10-11 16:57:46 +02:00

print_options.c

…

protocols.texi

doc/protocols: add option usage description

2017-02-13 12:23:03 -09:00

rate_distortion.txt

…

resampler.texi

swresample/options: enable linear_interp and exact_rational by default

2017-03-17 00:08:03 +07:00

scaler.texi

doc/scaler: mention default scaling algorithm

2017-01-09 12:58:25 -09:00

snow.txt

…

style.min.css

…

swresample.txt

…

swscale.txt

…

t2h.init

doc/t2h: use container

2016-10-03 00:16:27 +01:00

t2h.pm

doc/t2h: use container

2016-10-03 00:16:27 +01:00

tablegen.txt

…

texi2pod.pl

doc: escape left brace in texi2pod.pl regex

2016-07-10 13:34:57 +02:00

texidep.pl

…

utils.texi

avutil/eval: add atan2 function

2017-01-30 11:04:31 +01:00

writing_filters.txt

…