* commit '56d061ce':
  metasound: add last missing modes (8kHz @ 6kbps per channel)

Conflicts:
	Changelog
	doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'de44dfc7':
  vc1: Reset numref if fieldmode is not set

This change is redundant, numref is already reset
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Simplify.

The macro value can be shared between configure script and cmdutils.c.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

* qatar/master:
  aacsbr: Add some const casts to silence warnings in ff_sbr_apply()

Conflicts:
	libavcodec/aacsbr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit 'ab81f24a':
  build: Integrate multilibrary examples into the build system

Conflicts:
	configure
	doc/Makefile
	doc/examples/muxing.c
	doc/examples/output.c
	libavformat/Makefile
	libavformat/output-example.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '14abeaa4':
  build: Separate building programs linking against libav* from building av*

Conflicts:
	Makefile
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

There are samples in the wild with B-frames and P-frames with different
interlace mode.

CC: libav-stable@libav.org
Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Fixes out of array read
Fixes assertion failure
Fixes asan_static-oob_16431c0_8036_rio_bravo_mono_64_spx.ac3

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This includes moving libavformat/output-example to doc/examples/output.

This will allow cleaner integration of building example programs.

Fixes out of array accesses
Fixes asan_static-oob_eb9812_5961_iv41.avi
This reverts the merge of c9ef6b09

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

This option allows to add a prefix to the segment list entry filenames.

Also set by default the list entry filenames to the corresponding
segment basename, consistent with the HLS muxer.

Based on an idea by Steven Liu <lingjiujianke@gmail.com>.

Opus Pre Skip is exported in AVCodecContext->delay similar to how
it is done for matroska. Doing the same for ogg too.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  doc: Add the host executable suffix for the print_options dependency

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

This fixes building on windows.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

This partially reverts commit c0237d19
Some scripts make use of --disable-doc
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec_register_all() is implicitly called by av_register_all().

* qatar/master:
  build: Import makedef script from c99-to-c89
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This allows MSVC 2013 and ICL to build with no external
dependencies.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes Ticket1708
Based on patch by Alberto Delmás
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

They are automatically freed when calling av_write_trailer(). Simplify.

Some media players don't play the resulting files.
The warning should help users to avoid the issues described in ticket #1720.

* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0eeeb964':
  mpegaudiodec: Consistently handle fixed/float templating

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '48b24bd2':
  ac3dec: Fix out-of-array read

Conflicts:
	libavcodec/ac3dec.c

See: 2cbf27b0Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f187557a':
  build: more fine-grained dependencies for documentation build tools

Conflicts:
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array reads
Fixes: asan_heap-oob_f0de57_6823_mjp2.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

The stride argument is passed either as stridea or strideb.