* commit 'd2a4e4b9':
  wma: K&R formatting cosmetics

Conflicts:
	libavcodec/wma.c
	libavcodec/wmadec.c
	libavcodec/wmaenc.c

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

Code is only used during initialization, so malloc/free
should be fine to use.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Not sure it was meant to be used for something at some point though.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

A bit more complex than e.g. adding it to the context, but
using the context for something that will be used only during
initialization seemed a bit wasteful.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Lou Logan <lou@lrcd.com>

Add the feature test macro which is required for building with the
musl toolchain.

The feature test macro _XOPEN_SOURCE = 600 provides the XSI-compliant
version of strerror_r().

Signed-off-by: Jörg Krause <jkrause@posteo.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c487972e':
  ismindex: recover from completely empty streams

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

* commit '95e177ee':
  rtpdec: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpdec_hevc.c
	libavformat/version.h

See: 96b2ba68
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ebef9f5a':
  time: Use clock_gettime if the monotonic clock is available

Conflicts:
	configure

The change to av_gettime() isnt merged, a patch will be posted to the mailing list
that would do the switch

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

* commit '65e78a2e':
  x11grab: Refactor pixel format parsing

Conflicts:
	libavdevice/x11grab.c

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

* commit 'bb3ead7e':
  x11grab: Fallback to normal XImage if SHM is not supported

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

* commit 'c19a49e5':
  ppc: Support little endian intreadwrite

Conflicts:
	libavutil/ppc/intreadwrite.h

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

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

* commit '7968059e':
  mpegts: Allow custom max resync size

Conflicts:
	libavformat/mpegts.c

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

* commit '94f08432':
  texi2pod: Make it output a single encoding string

Conflicts:
	doc/texi2pod.pl

See: 12ce58be
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4912b634':
  x265: Use the encoder defaults

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

This creates best-effort results from input that is missing stream
contents, there are warnings printed when this happens.

Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized functions are also used

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

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

* commit 'eda7571e':
  wmv2: K&R formatting cosmetics

Conflicts:
	libavcodec/wmv2.c
	libavcodec/wmv2dec.c
	libavcodec/wmv2enc.c

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

* commit '7a1d6ddd':
  xvid: Add C IDCT

Conflicts:
	libavcodec/dct-test.c
	libavcodec/xvididct.c

See: 298b3b6c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '95c0cec0':
  idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

Conflicts:
	libavcodec/arm/idctdsp_init_arm.c
	libavcodec/dct.h
	libavcodec/idctdsp.c
	libavcodec/jrevdct.c

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

As specified in draft-ietf-payload-rtp-h265-06.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.

Reset the settings as it is done for x264.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

These function pointers already existed in the ARM code. Adding them globally
allows calls to the function pointers to access arch-optimized versions of the
functions transparently.

* commit '91d30579':
  get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

Conflicts:
	libavcodec/golomb.h

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

* commit 'ff4d1aa8':
  flv: K&R formatting cosmetics

Conflicts:
	libavcodec/flv.h
	libavcodec/flvdec.c
	libavcodec/flvenc.c

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

* commit 'f61e47dd':
  asv: K&R formatting cosmetics

Conflicts:
	libavcodec/asvdec.c
	libavcodec/asvenc.c

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

* commit '74512f7e':
  8svx: Return proper error codes

Conflicts:
	libavcodec/8svx.c

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

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>