* commit '14abeaa43d021afdce9119d906891abe89c03b88':
build: Separate building programs linking against libav* from building av*
Conflicts:
Makefile
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Fixes out of array accesses
Fixes asan_static-oob_eb9812_5961_iv41.avi
This reverts the merge of c9ef6b0932
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
This option allows to add a prefix to the segment list entry filenames.
Also set by default the list entry filenames to the corresponding
segment basename, consistent with the HLS muxer.
Based on an idea by Steven Liu <lingjiujianke@gmail.com>.
Opus Pre Skip is exported in AVCodecContext->delay similar to how
it is done for matroska. Doing the same for ogg too.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This partially reverts commit c0237d19a0
Some scripts make use of --disable-doc
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes out of array reads
Fixes: asan_heap-oob_f0de57_6823_mjp2.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes memleak
Fixes: asan_heap-oob_e76bdf_2224_MOTHOO.HNM
This patch also removes the setting of palette_has_changed,
which was set on a frame that was never returned
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 -> 1. vp8 encoding speed has improved since the initial release and 1
is a reasonable default for vp9 as well.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
libschroedingerenc: do not assert on values from external libraries
Conflicts:
libavcodec/libschroedingerenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
ac3dec: Remove write-only channel_layout field from AC3DecodeContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
swscale: x86: Consistently use lowercase function name suffixes
Conflicts:
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c
See: 1de064e21e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This allows installing into e.g. /usr/lib/ffmpeg and binaries linked
against ffmpeg will pick these .so file while binaries linked against
some fork or different version will pick the libraries in /usr/lib.
There will be still some issues for binaries that (indirectly) end up
depending on multiple variants, but for the simpler cases it should allow
different applications to use different (compatible) variants that
are installed at the same time.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Fixes out of array read
Fixes: asan_heap-oob_e76e18_1244_CASSE.HNM
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer
Diego Biurrun
Marton Balint
Stefano Sabatini
Vignesh Venkatasubramanian
Martin Storsjö
Hendrik Leppkes
James Almer
Derek Buitenhuis
Alberto Delmás
Carl Eugen Hoyos
Paul B Mahol
Clément Bœsch
Tim Walker
James Zern
Alexandra Khirnova
Anton Khirnov
Reimar Döffinger