* commit '8a0bc405':
  libspeex: support ZygoAudio (quality 10 mode)

Conflicts:
	libavformat/isom.c

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

* commit '360022bd':
  isom: lpcm in mov default to big endian

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

* commit 'db32f14c':
  isom: add "MNG" FourCC

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

* commit '073cd30f':
  isom: Support MPEG-2 video mov files from FPC5

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

* commit '31e558fb':
  isom: add "NO16" FourCC

Conflicts:
	libavformat/isom.c

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

* commit '65090123':
  isom: add Radius DV YUV FourCCs

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

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

* commit 'eeae8585':
  isom: Support Sony XAVC in mov

See: 5b9f3986
See: 6e65e348Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0980468':
  isom: add xd51 hdcam

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

* commit '4d33873c':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevc_ps.c

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

* commit 'ed06e5d9':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
	libavcodec/hevc.c

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

* commit '6cc94e97':
  hevc: use av_mallocz() for allocating tab_ipm

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

* commit '920c01ad':
  hevc: Use get_bits_long() in decode_vui()

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

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178
Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Someone needs to binary search FCP for new isom...

Fixes integer overflow and out of array accesses.
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind

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

Fixes use of uninitialized memory and out of stack array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

* qatar/master:
  float_dsp: fix errors in documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'c708b540':
  timer: use mach_absolute_time as high resolution clock on darwin

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

* commit '634d9d8b':
  arm: get_cabac inline asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'dfe224f3':
  aarch64: get_cabac inline asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4506a854':
  arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fix assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

* cus/stable:
  libzvbi-teletextdec: split dvb packet to slices
  libzvbi-teletextdec: use av_dlog where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  build: Use pkg-config for openjpeg

Conflicts:
	configure

Not merged / merge just for metadata at request of carl
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '565e0c6d':
  movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0092c1dd':
  matroskaenc: allow override of "writing application" tag

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

* commit '61985ad7':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8c095326':
  rv10: K&R formatting cosmetics

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

* commit 'b4d372e0':
  rv10: Forward error from rv10_decode_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Not guaranteed to be in nanosecond resolution. On iOS 7 the duration
of one tick is 125/3 ns which is still more than an order of magnitude
better then microseconds.

Replace decicycles with the neutral UNITS. Decicycles is strange but
tenths of a nanosecond and unspecific "deci"-ticks for mach_absolute_time
is just silly.