It was misplaced during merge of commit 120797e2ef
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Directly loads AviSynth through LoadLibrary instead of relying on
Video for Windows, and supports using AvxSynth (via dlopen) to
open scripts on Linux and OS X.
Error messages from AviSynth/AvxSynth are now reported through
av_log and exit, rather than the traditional behavior of generating
an error video that the user would need to watch to diagnose.
The main rewrite was authored by d s <avxsynth.testing@gmail.com>
from the AvxSynth team, with additional contributions by
Oka Motofumi <chikuzen.mo@gmail.com>
Stephen Hutchinson <qyot27@gmail.com>
Diego Biurrun <diego@biurrun.de>
Anton Khirnov <anton@khirnov.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.
Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* qatar/master:
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
Conflicts:
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* rbultje/vp9-simd:
vp9: implement top/left half (4x4) sub-8x8-IDCT.
vp9: split pre-load of 11585x2 out of 1d idct macro.
vp9: minor refactorings in idct ssse3 assembly.
vp9: split x86 assembly in two files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* cus/stable:
ffplay: set default window size before starting audio
ffplay: factor out function setting default window size
ffplay: remove no longer necessary codec flush
ffplay: do not wait for flushing the picture queue on flush packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
dcadec: Decode LFE to avoid adding random data when downmixing with LFE
See: 6e7de11444
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Should fix issues compiling lavr's Windows resource file.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
It was introduced in c2e8691c07ca52de7b6b00ba8f2b30c56fd786d7, but since we no
longer no longer provide a custom get_buffer callback, the original cause of
the issue is gone.
Signed-off-by: Marton Balint <cus@passwd.hu>
It is no longer necessary. Also do frame timer and video current pos reset in
the main thread because with the wait removed, the timing would not be optimal
in the read thread.
Signed-off-by: Marton Balint <cus@passwd.hu>
Anton Khirnov
Michael Niedermayer
James Almer
d s
Diego Biurrun
Andrey Utkin
Alexander Strasser
Guillaume Martres
Ronald S. Bultje
Marton Balint