* commit '416847d19593e87ee1704c26a9a638fd6b0d977c':
vf_frei0r: prevent a segfault when filter parameters are not set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97':
vf_frei0r: fix missing end of line character
Conflicts:
libavfilter/vf_frei0r.c
No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '6230de03aad9f26d5843afb913d196622e0b5b98':
vf_frei0r: refactor library loading from env variable
Conflicts:
configure
libavfilter/vf_frei0r.c
Not merged, we use av_strtok() which leads to simpler code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d':
doc: fix a couple of typos in frame.h
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'd37fac6dbbdddb76225aa691b83ffd9a0c7dae6b':
isom: lpcm in mov default to big endian
movdec: handle 0x7fff langcode as macintosh per the specs
No change as these have been part of the branch previously
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 88c8e4afeaf74ee58b67145e0331e229d8050968)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5d5e2bd86242506a5af4b290b72e1c52f62f7fb6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2':
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>
(cherry picked from commit cb403b2570385cbf48a11f9f48441de5cd01171e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c':
movenc: write hvcC tag for HEVC.
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4':
movenc: Add a fallback fragmentation method for plain mp4 as well
Conflicts:
libavformat/movenc.c
See: ef1aae6ea9aae9a523b6dcd8e670dbca823a88f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'fa6b99d351ed483766a875054676a56fd8459774':
hevc: Do not turn 32bit timebases into negative numbers
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'd79cb6947e4a9c42ac20925dd920d3a0910d9a26':
hevc: use av_mallocz() for allocating tab_ipm
See: 26568c04a8270ad792f3b86223914095b178b3a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '5aa4b29bbefc06fc2bbcb52af7a14393a1bcf504':
hevc: Use get_bits_long() in decode_vui()
See: e15a57b67a2600e2fa6db8e6c8485add305671d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd':
changelog: Cleanups and prepare for v10_beta2
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'f2693e98b449592ec0ed4979220814bf54e60a16':
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 'c3861e14ceace7ee69820091871173b4abcae311':
movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '72a58c0772450993d375c6cf4b187a068f5bc765':
Update default FATE URL for release/10
Conflicts:
tests/Makefile
Merge for metadata only as we dont duplicate the fate samples per release branch.
Theres no need for that currently
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'd5254230068e196a2496618c0d89cdfbc41f7478':
Revert "Add libx265 encoder"
Conflicts:
Changelog
LICENSE
configure
doc/general.texi
libavcodec/allcodecs.c
libavcodec/libx265.c
Not merged, release branches should only contain bugfixes
a feature removial like this has to be discussed on ffmpeg-devel first
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This reverts commit 3144440004941aa22ffea9933f5e5dfe826df654.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bba7b6fc41057d4aec6b1f0e12240db56fe6e9b6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.
(cherry picked from commit 34bbc81de8a49fbddb92b76dc733f40890480b2b)
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>
(cherry picked from commit 360022bd3b894cc01ea112b275fa4c8f53881808)
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.
(cherry picked from commit 9e71cc81f3655cacf0f91860fba3043f13b64059)
'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.
(cherry picked from commit 1d9014f0b008485eac4c19d5f5e11ede59237167)
Previously the default fragmentation method was only enabled
if writing an ISM file.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66)
