Clément Bœsch ee161dac9d Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9' ...

* commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9': (35 commits)
  qdm2: Convert to the new bitstream reader
  qcelp: Convert to the new bitstream reader
  pcx: Convert to the new bitstream reader
  opus: Convert to the new bitstream reader
  nellymoser: Convert to the new bitstream reader
  jvdec: Convert to the new bitstream reader
  hqx: Convert to the new bitstream header
  hq_hqa: Convert to the new bitstream reader
  gsm: Convert to the new bitstream reader
  g72x: Convert to the new bitstream reader
  g2meet: Convert to the new bitstream reader
  fraps: Convert to the new bitstream reader
  flashsv: Convert to the new bitstream reader
  faxcompr: Convert to the new bitstream reader
  exr: Convert to the new bitstream reader
  escape130: Convert to the new bitstream reader
  escape124: Convert to the new bitstream reader
  dvdsubdec: Convert to the new bitstream reader
  dss_sp: Convert to the new bitstream reader
  cook: Convert to the new bitstream reader
  ...

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

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

2017-04-03 20:38:28 +02:00

..

doxy

Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'

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

examples

doc/examples/transcode_aac: replace local get_error_text with av_err2str

2017-04-01 12:45:33 +02:00

.gitignore

Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'

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

APIchanges

avutil/spherical: add av_spherical_projection_name()

2017-03-31 13:26:56 -03:00

authors.texi

…

bitstream_filters.texi

doc/bitstream_filters: Fix project name after merge

2017-03-26 19:17:30 +02:00

bootstrap.min.css

doc: Copyright in CSS, CSS split in 2 files

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

build_system.txt

Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'

2016-04-17 19:36:59 +01:00

codecs.texi

doc/codecs: add jedec-p22

2017-03-30 13:59:15 +02:00

decoders.texi

cosmetics: fix some misspelled words

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

default.css

doc: restore default.css

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

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

doc: make apidoc output independent of SRC_PATH

2016-01-02 12:11:36 +01:00

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

doc/errno: fix description typo for ENAMETOOLONG

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

faq.texi

faq: use relative links to own documentation

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

fate_config.sh.template

Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'

2015-05-16 21:14:01 +02:00

fate.texi

Merge commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2'

2017-03-19 18:34:48 +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

Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'

2017-03-24 11:40:35 +01:00

ffmpeg.txt

…

ffplay.texi

ffplay: allow borderless playback windows

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

ffprobe.texi

doc/ffprobe: add -show_log option

2017-03-28 00:13:47 +02:00

ffprobe.xsd

ffprobe.xsd: add frame log data

2017-03-28 00:13:47 +02:00

ffserver.conf

lavc: remove libfaac wrapper

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

ffserver.texi

Use @verbatim instead of @example for ASCII arts

2015-04-11 01:14:51 +02:00

fftools-common-opts.texi

doc: Add muxers/demuxers list option

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

filter_design.txt

lavfi: drop the requirement that request_frame returns a frame.

2015-09-20 19:02:33 +02:00

filters.texi

lavfi: remove af_asynts filter

2017-03-27 14:06:16 +01:00

formats.texi

avformat: Add max_streams option

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

general.texi

Merge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f'

2017-04-01 12:41:42 +02:00

git-howto.texi

Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

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

indevs.texi

avdevice/decklink: new option 'format_code' to set video format by fourCC

2017-03-22 02:07:50 +01:00

issue_tracker.txt

doc/issue_tracker.txt: various updates

2015-12-11 11:33:29 -09:00

lexicon

doc: add a lexicon

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

libav-merge.txt

Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'

2017-04-03 20:38:28 +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 '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d'

2017-03-29 14:09:09 +02:00

metadata.texi

doc: More semantic markup using @samp and @var where appropriate

2015-03-23 17:08:08 +01:00

mips.txt

Edit documentation and versioning for the fixed point AAC decoder

2015-07-22 23:25:33 +02:00

multithreading.txt

Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'

2015-07-27 22:50:18 +02:00

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 '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428'

2017-03-21 14:29:52 -03: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

Merge commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484'

2017-03-29 15:20:10 +02:00

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

fix some a/an typos

2016-03-28 14:13:17 -08:00

style.min.css

doc: Copyright in CSS, CSS split in 2 files

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

swresample.txt

…

swscale.txt

cosmetics: Fix spelling mistakes

2016-05-04 18:16:21 +02:00

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

doc/writing_filters: miscellaneous grammar and typo fixes

2015-10-08 16:27:24 +02:00