* commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2':
movenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-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: ef1aae6ea9
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: 26568c04a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '5aa4b29bbefc06fc2bbcb52af7a14393a1bcf504':
hevc: Use get_bits_long() in decode_vui()
See: e15a57b67a
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>
'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 1d9014f0b0)
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 1e142d5b48)
Fixes use of uninitialized memory and out of stack array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 6cc94e9719)
Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.
Fix trac ticket #3430.
(cherry picked from commit bc6901c949)
The s390 architecture requires shared libraries to be built in PIC mode.
Otherwise applications will get wrong relocations at run-time, leading
to confusing segmentation faults.
CC: libav-stable@libav.org
(cherry picked from commit 5ddc9f5052)
* qatar/release/10:
ituh263: reject b-frame with pp_time = 0
af_compand: replace strtok_r() with av_get_token()
latm: Always reconfigure if no extradata was set previously
af_compand: add a dependency on strtok_r
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
All changes are already in our 2.2 branch, this is just for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
