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

* qatar/master:
  Add an audio transcoding example.

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

Add options to control the size of the PulseAudio buffer.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

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

* qatar/master:
  build: Check for pod2man instead of perl for manual page generation

Conflicts:
	configure
	doc/Makefile

The code that this changes is mostly not part of ffmpeg
thus only a few whitespaces end up being merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4da3f410':
  configure: Restore doc option to disable building the documentation

Conflicts:
	configure

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

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

* commit 'dc80e2f7':
  Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:
	Makefile

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

Fixes out of array read
Fixes: asan_heap-uaf_ae6067_5415_g2m4.wmv

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

Fixes out of array accesses
Fixes: asan_heap-oob_ae5f63_5415_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some systems provide Perl without pod2man.

Also add appropriate dependency declarations for perl and texi2html.

This fixes leftover issues from 14abeaa4 which caused make
rules for programs to not match up properly when the executable
suffix was nonempty.
Signed-off-by: Martin Storsjö <martin@martin.st>

Avoid busy loops and decrease CPU usage.

Suggested-By: Roger Pack

It will be used in event_thread() in a pending patch.

SDL_Init() is called on the event handler thread, as required by SDL in
Windows to avoid deadlocks as discovered by Roger Pack.

Fix trac ticket #1743 and #1744.

cherry picked from commit 211c39ade87bc079eabc862a6b684544dc88a786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lavc: remove mp3_header_(de)compress bitstream filters

Conflicts:
	Changelog
	libavcodec/mp3_header_compress_bsf.c
	libavcodec/mp3_header_decompress_bsf.c

The decompress filter is left in place for interoperability and support of
files that used the compress filter.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1eaac1d6':
  mpeg12dec: Extract CC user data into frame side data

Conflicts:
	doc/APIchanges
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

they should be supported now

This reverts commit 1ee1a3d9.

* commit 'a16577d9':
  MSN Audio support

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

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

They mangle the mp3 header in a non-standard way to save a few bytes.
People who care about space so much should just use a more efficient
codec.

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

This is essentially a MS GSM decoder extension that supports more
sampling rates and lower bitrates.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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>