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

* commit 'b6c61fb8':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '20b40a59':
  movenc: write hvcC tag for HEVC.

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

* commit '1d9014f0':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e0175d8':
  riff: add VP9 fourcc

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

* commit 'fb0a988f':
  riff: IPJ2 decodes with JPEG2000 decoder

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

* commit '9e71cc81':
  movdec: handle 0x7fff langcode as macintosh per the specs

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

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

'hvc1' requires that parameter set NAL units be
present only in the samples entry, but not in the
samples themselves, requiring that additional
parameter sets, if present, be filtered out of the
samples and placed in new, additional sample entries
if they override or otherwise conflict with the
parameter sets present in the first sample entry.
We do not have any way of doing this at present, so
the files we produce can only comply with the
restrictions set for the 'hev1' sample entry name in
ISO/IEC 14496-15.

Samples can be made from mencoder and jp2avi.dll codec.

The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

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>