* commit '9e71cc81f3655cacf0f91860fba3043f13b64059':
movdec: handle 0x7fff langcode as macintosh per the specs
See: e636aa1a56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '360022bd3b894cc01ea112b275fa4c8f53881808':
isom: lpcm in mov default to big endian
See: 8b3964ecd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b':
isom: Support MPEG-2 video mov files from FPC5
See: 0aded6bf02
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
isom: Support Sony XAVC in mov
See: 5b9f39860d
See: 6e65e34837
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
hevc: Do not turn 32bit timebases into negative numbers
Conflicts:
libavcodec/hevc.c
See: bf2ce19e51
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '6cc94e971933cd38c452172bb048bf760e65cc3e':
hevc: use av_mallocz() for allocating tab_ipm
See: 0999f1613b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '920c01adce6c273fc043513ff237a6266e612152':
hevc: Use get_bits_long() in decode_vui()
See: b818637b84
Merged-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.
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>
* commit 'c708b5403346255ea5adc776645616cc7c61f078':
timer: use mach_absolute_time as high resolution clock on darwin
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* 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 '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
