mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 1248483: Resync FFvpx to n3.0-1-g0aa2fbd. r=kentuckyfriedtakahe
MozReview-Commit-ID: JPOz0SldaSv
This commit is contained in:
Jean-Yves Avenard
parent
f63fc4693e
commit
fb123d02a5
@ -1,9 +1,8 @@
|
||||
Entries are sorted chronologically from oldest to youngest within each release,
|
||||
releases are sorted from youngest to oldest.
|
||||
|
||||
version <next>:
|
||||
- Common Encryption (CENC) MP4 decoding support
|
||||
- Common Encryption (CENC) MP4 encoding support
|
||||
version 3.0:
|
||||
- Common Encryption (CENC) MP4 encoding and decoding support
|
||||
- DXV decoding
|
||||
- extrastereo filter
|
||||
- ocr filter
|
||||
@ -52,6 +51,24 @@ version <next>:
|
||||
- automatic bitstream filtering
|
||||
- showspectrumpic filter
|
||||
- libstagefright support removed
|
||||
- spectrumsynth filter
|
||||
- ahistogram filter
|
||||
- only seek with the right mouse button in ffplay
|
||||
- toggle full screen when double-clicking with the left mouse button in ffplay
|
||||
- afftfilt filter
|
||||
- convolution filter
|
||||
- libquvi support removed
|
||||
- support for dvaudio in wav and avi
|
||||
- libaacplus and libvo-aacenc support removed
|
||||
- Cineform HD decoder
|
||||
- new DCA decoder with full support for DTS-HD extensions
|
||||
- significant performance improvements in Windows Television (WTV) demuxer
|
||||
- nnedi deinterlacer
|
||||
- streamselect video and astreamselect audio filter
|
||||
- swaprect filter
|
||||
- metadata video and ametadata audio filter
|
||||
- SMPTE VC-2 HQ profile support for the Dirac decoder
|
||||
- SMPTE VC-2 native encoder supporting the HQ profile
|
||||
|
||||
|
||||
version 2.8:
|
||||
|
||||
@ -104,7 +104,7 @@ license version needs to be upgraded by passing `--enable-version3` to configure
|
||||
incompatible libraries
|
||||
----------------------
|
||||
|
||||
The Fraunhofer AAC library, FAAC and aacplus are under licenses which
|
||||
The Fraunhofer AAC library and FAAC are under licenses which
|
||||
are incompatible with the GPLv2 and v3. We do not know for certain if their
|
||||
licenses are compatible with the LGPL.
|
||||
If you wish to enable these libraries, pass `--enable-nonfree` to configure.
|
||||
|
||||
@ -165,6 +165,7 @@ Codecs:
|
||||
crystalhd.c Philip Langdale
|
||||
cscd.c Reimar Doeffinger
|
||||
dca.c Kostya Shishkov, Benjamin Larsson
|
||||
dirac* Rostislav Pehlivanov
|
||||
dnxhd* Baptiste Coudurier
|
||||
dpcm.c Mike Melanson
|
||||
dss_sp.c Oleksij Rempel, Michael Niedermayer
|
||||
@ -209,7 +210,7 @@ Codecs:
|
||||
libschroedinger* David Conrad
|
||||
libspeexdec.c Justin Ruggles
|
||||
libtheoraenc.c David Conrad
|
||||
libutvideo* Derek Buitenhuis
|
||||
libutvideo* Carl Eugen Hoyos
|
||||
libvorbis.c David Conrad
|
||||
libvpx* James Zern
|
||||
libx264.c Mans Rullgard, Jason Garrett-Glaser
|
||||
@ -275,6 +276,7 @@ Codecs:
|
||||
vb.c Kostya Shishkov
|
||||
vble.c Derek Buitenhuis
|
||||
vc1* Kostya Shishkov, Christophe Gisquet
|
||||
vc2* Rostislav Pehlivanov
|
||||
vcr1.c Michael Niedermayer
|
||||
vda_h264_dec.c Xidorn Quan
|
||||
vima.c Paul B Mahol
|
||||
@ -475,6 +477,7 @@ Muxers/Demuxers:
|
||||
oggdec.c, oggdec.h David Conrad
|
||||
oggenc.c Baptiste Coudurier
|
||||
oggparse*.c David Conrad
|
||||
oggparsedaala* Rostislav Pehlivanov
|
||||
oma.c Maxim Poliakovski
|
||||
paf.c Paul B Mahol
|
||||
psxstr.c Mike Melanson
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
This directory contains files used in gecko builds from FFmpeg
|
||||
(http://ffmpeg.org). The current files are from FFmpeg as of
|
||||
revision n2.9-dev-2841-g369b161.
|
||||
revision n3.0-1-g0aa2fbd
|
||||
All source files match their path from the library's source archive.
|
||||
|
||||
Currently, we only use the vp8 and vp9 portion of the library, and only on x86
|
||||
based platforms. If this changes, configuration files will most likely
|
||||
need to be updated.
|
||||
|
||||
AVX2 was disabled due to the use of yasm 1.1 on the build bots.
|
||||
AVX2 must be disabled on Linux due to the use of yasm 1.1 on the build bots.
|
||||
Once yasm is upgraded to 1.2 or later, AVX2 code could be re-enabled.
|
||||
Add --disable-avx2 to configure on those platforms.
|
||||
|
||||
configuration files were generated as follow using the configure script:
|
||||
./configure --disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-asm --enable-yasm --disable-avx2
|
||||
./configure --disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-asm --enable-yasm
|
||||
|
||||
config_darwin32.h:
|
||||
add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
|
||||
|
||||
@ -1 +1 @@
|
||||
2.8.git
|
||||
3.0
|
||||
|
||||
15
media/ffvpx/RELEASE_NOTES
Normal file
15
media/ffvpx/RELEASE_NOTES
Normal file
@ -0,0 +1,15 @@
|
||||
|
||||
┌─────────────────────────────────────────┐
|
||||
│ RELEASE NOTES for FFmpeg 3.0 "Einstein" │
|
||||
└─────────────────────────────────────────┘
|
||||
|
||||
The FFmpeg Project proudly presents FFmpeg 3.0 "Einstein", about 5
|
||||
months after the release of FFmpeg 2.8.
|
||||
|
||||
A complete Changelog is available at the root of the project, and the
|
||||
complete Git history on http://source.ffmpeg.org.
|
||||
|
||||
We hope you will like this release as much as we enjoyed working on it, and
|
||||
as usual, if you have any questions about it, or any FFmpeg related topic,
|
||||
feel free to join us on the #ffmpeg IRC channel (on irc.freenode.net) or ask
|
||||
on the mailing-lists.
|
||||
@ -19,8 +19,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef COMPAT_SNPRINTF_H
|
||||
#define COMPAT_SNPRINTF_H
|
||||
#ifndef COMPAT_MSVCRT_SNPRINTF_H
|
||||
#define COMPAT_MSVCRT_SNPRINTF_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
@ -35,4 +35,4 @@ int avpriv_vsnprintf(char *s, size_t n, const char *fmt, va_list ap);
|
||||
#define _snprintf avpriv_snprintf
|
||||
#define vsnprintf avpriv_vsnprintf
|
||||
|
||||
#endif /* COMPAT_SNPRINTF_H */
|
||||
#endif /* COMPAT_MSVCRT_SNPRINTF_H */
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef COMPAT_VA_COPY_H
|
||||
#define COMPAT_VA_COPY_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#if !defined(va_copy) && defined(_MSC_VER)
|
||||
@ -27,3 +30,5 @@
|
||||
#if !defined(va_copy) && defined(__GNUC__) && __GNUC__ < 3
|
||||
#define va_copy(dst, src) __va_copy(dst, src)
|
||||
#endif
|
||||
|
||||
#endif /* COMPAT_VA_COPY_H */
|
||||
|
||||
@ -26,8 +26,8 @@
|
||||
* w32threads to pthreads wrapper
|
||||
*/
|
||||
|
||||
#ifndef FFMPEG_COMPAT_W32PTHREADS_H
|
||||
#define FFMPEG_COMPAT_W32PTHREADS_H
|
||||
#ifndef COMPAT_W32PTHREADS_H
|
||||
#define COMPAT_W32PTHREADS_H
|
||||
|
||||
/* Build up a pthread-like API using underlying Windows API. Have only static
|
||||
* methods so as to not conflict with a potentially linked in pthread-win32
|
||||
@ -39,6 +39,11 @@
|
||||
#include <windows.h>
|
||||
#include <process.h>
|
||||
|
||||
#if _WIN32_WINNT < 0x0600 && defined(__MINGW32__)
|
||||
#undef MemoryBarrier
|
||||
#define MemoryBarrier __sync_synchronize
|
||||
#endif
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/internal.h"
|
||||
@ -82,19 +87,29 @@ static av_unused int pthread_create(pthread_t *thread, const void *unused_attr,
|
||||
{
|
||||
thread->func = start_routine;
|
||||
thread->arg = arg;
|
||||
#if HAVE_WINRT
|
||||
thread->handle = (void*)CreateThread(NULL, 0, win32thread_worker, thread,
|
||||
0, NULL);
|
||||
#else
|
||||
thread->handle = (void*)_beginthreadex(NULL, 0, win32thread_worker, thread,
|
||||
0, NULL);
|
||||
#endif
|
||||
return !thread->handle;
|
||||
}
|
||||
|
||||
static av_unused void pthread_join(pthread_t thread, void **value_ptr)
|
||||
static av_unused int pthread_join(pthread_t thread, void **value_ptr)
|
||||
{
|
||||
DWORD ret = WaitForSingleObject(thread.handle, INFINITE);
|
||||
if (ret != WAIT_OBJECT_0)
|
||||
return;
|
||||
if (ret != WAIT_OBJECT_0) {
|
||||
if (ret == WAIT_ABANDONED)
|
||||
return EINVAL;
|
||||
else
|
||||
return EDEADLK;
|
||||
}
|
||||
if (value_ptr)
|
||||
*value_ptr = thread.ret;
|
||||
CloseHandle(thread.handle);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int pthread_mutex_init(pthread_mutex_t *m, void* attr)
|
||||
@ -119,6 +134,19 @@ static inline int pthread_mutex_unlock(pthread_mutex_t *m)
|
||||
}
|
||||
|
||||
#if _WIN32_WINNT >= 0x0600
|
||||
typedef INIT_ONCE pthread_once_t;
|
||||
#define PTHREAD_ONCE_INIT INIT_ONCE_STATIC_INIT
|
||||
|
||||
static av_unused int pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
|
||||
{
|
||||
BOOL pending = FALSE;
|
||||
InitOnceBeginInitialize(once_control, 0, &pending, NULL);
|
||||
if (pending)
|
||||
init_routine();
|
||||
InitOnceComplete(once_control, 0, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
|
||||
{
|
||||
InitializeConditionVariable(cond);
|
||||
@ -126,14 +154,15 @@ static inline int pthread_cond_init(pthread_cond_t *cond, const void *unused_att
|
||||
}
|
||||
|
||||
/* native condition variables do not destroy */
|
||||
static inline void pthread_cond_destroy(pthread_cond_t *cond)
|
||||
static inline int pthread_cond_destroy(pthread_cond_t *cond)
|
||||
{
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
static inline int pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
{
|
||||
WakeAllConditionVariable(cond);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
||||
@ -142,14 +171,77 @@ static inline int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void pthread_cond_signal(pthread_cond_t *cond)
|
||||
static inline int pthread_cond_signal(pthread_cond_t *cond)
|
||||
{
|
||||
WakeConditionVariable(cond);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else // _WIN32_WINNT < 0x0600
|
||||
|
||||
/* atomic init state of dynamically loaded functions */
|
||||
static LONG w32thread_init_state = 0;
|
||||
static av_unused void w32thread_init(void);
|
||||
|
||||
/* for pre-Windows 6.0 platforms, define INIT_ONCE struct,
|
||||
* compatible to the one used in the native API */
|
||||
|
||||
typedef union pthread_once_t {
|
||||
void * Ptr; ///< For the Windows 6.0+ native functions
|
||||
LONG state; ///< For the pre-Windows 6.0 compat code
|
||||
} pthread_once_t;
|
||||
|
||||
#define PTHREAD_ONCE_INIT {0}
|
||||
|
||||
/* function pointers to init once API on windows 6.0+ kernels */
|
||||
static BOOL (WINAPI *initonce_begin)(pthread_once_t *lpInitOnce, DWORD dwFlags, BOOL *fPending, void **lpContext);
|
||||
static BOOL (WINAPI *initonce_complete)(pthread_once_t *lpInitOnce, DWORD dwFlags, void *lpContext);
|
||||
|
||||
/* pre-Windows 6.0 compat using a spin-lock */
|
||||
static inline void w32thread_once_fallback(LONG volatile *state, void (*init_routine)(void))
|
||||
{
|
||||
switch (InterlockedCompareExchange(state, 1, 0)) {
|
||||
/* Initial run */
|
||||
case 0:
|
||||
init_routine();
|
||||
InterlockedExchange(state, 2);
|
||||
break;
|
||||
/* Another thread is running init */
|
||||
case 1:
|
||||
while (1) {
|
||||
MemoryBarrier();
|
||||
if (*state == 2)
|
||||
break;
|
||||
Sleep(0);
|
||||
}
|
||||
break;
|
||||
/* Initialization complete */
|
||||
case 2:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static av_unused int pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
|
||||
{
|
||||
w32thread_once_fallback(&w32thread_init_state, w32thread_init);
|
||||
|
||||
/* Use native functions on Windows 6.0+ */
|
||||
if (initonce_begin && initonce_complete) {
|
||||
BOOL pending = FALSE;
|
||||
initonce_begin(once_control, 0, &pending, NULL);
|
||||
if (pending)
|
||||
init_routine();
|
||||
initonce_complete(once_control, 0, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
w32thread_once_fallback(&once_control->state, init_routine);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* for pre-Windows 6.0 platforms we need to define and use our own condition
|
||||
* variable and api */
|
||||
|
||||
typedef struct win32_cond_t {
|
||||
pthread_mutex_t mtx_broadcast;
|
||||
pthread_mutex_t mtx_waiter_count;
|
||||
@ -169,6 +261,9 @@ static BOOL (WINAPI *cond_wait)(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
||||
static av_unused int pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
|
||||
{
|
||||
win32_cond_t *win32_cond = NULL;
|
||||
|
||||
w32thread_once_fallback(&w32thread_init_state, w32thread_init);
|
||||
|
||||
if (cond_init) {
|
||||
cond_init(cond);
|
||||
return 0;
|
||||
@ -191,12 +286,12 @@ static av_unused int pthread_cond_init(pthread_cond_t *cond, const void *unused_
|
||||
return 0;
|
||||
}
|
||||
|
||||
static av_unused void pthread_cond_destroy(pthread_cond_t *cond)
|
||||
static av_unused int pthread_cond_destroy(pthread_cond_t *cond)
|
||||
{
|
||||
win32_cond_t *win32_cond = cond->Ptr;
|
||||
/* native condition variables do not destroy */
|
||||
if (cond_init)
|
||||
return;
|
||||
return 0;
|
||||
|
||||
/* non native condition variables */
|
||||
CloseHandle(win32_cond->semaphore);
|
||||
@ -205,16 +300,17 @@ static av_unused void pthread_cond_destroy(pthread_cond_t *cond)
|
||||
pthread_mutex_destroy(&win32_cond->mtx_broadcast);
|
||||
av_freep(&win32_cond);
|
||||
cond->Ptr = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static av_unused void pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
static av_unused int pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
{
|
||||
win32_cond_t *win32_cond = cond->Ptr;
|
||||
int have_waiter;
|
||||
|
||||
if (cond_broadcast) {
|
||||
cond_broadcast(cond);
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* non native condition variables */
|
||||
@ -236,6 +332,7 @@ static av_unused void pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
} else
|
||||
pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
|
||||
pthread_mutex_unlock(&win32_cond->mtx_broadcast);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static av_unused int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
||||
@ -270,13 +367,13 @@ static av_unused int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mu
|
||||
return pthread_mutex_lock(mutex);
|
||||
}
|
||||
|
||||
static av_unused void pthread_cond_signal(pthread_cond_t *cond)
|
||||
static av_unused int pthread_cond_signal(pthread_cond_t *cond)
|
||||
{
|
||||
win32_cond_t *win32_cond = cond->Ptr;
|
||||
int have_waiter;
|
||||
if (cond_signal) {
|
||||
cond_signal(cond);
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
pthread_mutex_lock(&win32_cond->mtx_broadcast);
|
||||
@ -293,6 +390,7 @@ static av_unused void pthread_cond_signal(pthread_cond_t *cond)
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&win32_cond->mtx_broadcast);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -309,8 +407,12 @@ static av_unused void w32thread_init(void)
|
||||
(void*)GetProcAddress(kernel_dll, "WakeConditionVariable");
|
||||
cond_wait =
|
||||
(void*)GetProcAddress(kernel_dll, "SleepConditionVariableCS");
|
||||
initonce_begin =
|
||||
(void*)GetProcAddress(kernel_dll, "InitOnceBeginInitialize");
|
||||
initonce_complete =
|
||||
(void*)GetProcAddress(kernel_dll, "InitOnceComplete");
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
#endif /* FFMPEG_COMPAT_W32PTHREADS_H */
|
||||
#endif /* COMPAT_W32PTHREADS_H */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Automatically generated by configure - do not modify! */
|
||||
#ifndef FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-avx2 --cc='clang -m32' --disable-asm"
|
||||
#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-asm --enable-yasm --disable-asm --disable-yasm --cc='clang -m32'"
|
||||
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||||
#define CONFIG_THIS_YEAR 2016
|
||||
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||||
@ -217,6 +217,7 @@
|
||||
#define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
#define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
#define HAVE_MALLOC_H 0
|
||||
#define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -250,6 +251,7 @@
|
||||
#define HAVE_EXP2F 1
|
||||
#define HAVE_EXPF 1
|
||||
#define HAVE_HYPOT 1
|
||||
#define HAVE_ISFINITE 1
|
||||
#define HAVE_ISINF 1
|
||||
#define HAVE_ISNAN 1
|
||||
#define HAVE_LDEXPF 1
|
||||
@ -335,9 +337,9 @@
|
||||
#define HAVE_GNU_AS 0
|
||||
#define HAVE_GNU_WINDRES 0
|
||||
#define HAVE_IBM_ASM 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_INLINE_ASM_LABELS 1
|
||||
#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_PRAGMA_DEPRECATED 1
|
||||
#define HAVE_RSYNC_CONTIMEOUT 0
|
||||
#define HAVE_SYMVER_ASM_LABEL 1
|
||||
@ -361,9 +363,8 @@
|
||||
#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
|
||||
#define HAVE_ATOMICS_NATIVE 1
|
||||
#define HAVE_DOS_PATHS 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_DXVA2_LIB 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#define HAVE_LIBDC1394_1 0
|
||||
#define HAVE_LIBDC1394_2 0
|
||||
@ -377,6 +378,7 @@
|
||||
#define HAVE_THREADS 1
|
||||
#define HAVE_VAAPI_X11 0
|
||||
#define HAVE_VDPAU_X11 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_XLIB 0
|
||||
#define CONFIG_BSFS 0
|
||||
#define CONFIG_DECODERS 1
|
||||
@ -421,7 +423,6 @@
|
||||
#define CONFIG_GNUTLS 0
|
||||
#define CONFIG_ICONV 0
|
||||
#define CONFIG_LADSPA 0
|
||||
#define CONFIG_LIBAACPLUS 0
|
||||
#define CONFIG_LIBASS 0
|
||||
#define CONFIG_LIBBLURAY 0
|
||||
#define CONFIG_LIBBS2B 0
|
||||
@ -452,7 +453,6 @@
|
||||
#define CONFIG_LIBOPENJPEG 0
|
||||
#define CONFIG_LIBOPUS 0
|
||||
#define CONFIG_LIBPULSE 0
|
||||
#define CONFIG_LIBQUVI 0
|
||||
#define CONFIG_LIBRTMP 0
|
||||
#define CONFIG_LIBRUBBERBAND 0
|
||||
#define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -468,7 +468,6 @@
|
||||
#define CONFIG_LIBUTVIDEO 0
|
||||
#define CONFIG_LIBV4L2 0
|
||||
#define CONFIG_LIBVIDSTAB 0
|
||||
#define CONFIG_LIBVO_AACENC 0
|
||||
#define CONFIG_LIBVO_AMRWBENC 0
|
||||
#define CONFIG_LIBVORBIS 0
|
||||
#define CONFIG_LIBVPX 0
|
||||
@ -588,8 +587,8 @@
|
||||
#define CONFIG_INTRAX8 0
|
||||
#define CONFIG_IVIDSP 0
|
||||
#define CONFIG_JPEGTABLES 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LGPLV3 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LLAUDDSP 0
|
||||
#define CONFIG_LLVIDDSP 0
|
||||
#define CONFIG_LPC 0
|
||||
@ -664,6 +663,7 @@
|
||||
#define CONFIG_CAVS_DECODER 0
|
||||
#define CONFIG_CDGRAPHICS_DECODER 0
|
||||
#define CONFIG_CDXL_DECODER 0
|
||||
#define CONFIG_CFHD_DECODER 0
|
||||
#define CONFIG_CINEPAK_DECODER 0
|
||||
#define CONFIG_CLJR_DECODER 0
|
||||
#define CONFIG_CLLC_DECODER 0
|
||||
@ -677,6 +677,7 @@
|
||||
#define CONFIG_DNXHD_DECODER 0
|
||||
#define CONFIG_DPX_DECODER 0
|
||||
#define CONFIG_DSICINVIDEO_DECODER 0
|
||||
#define CONFIG_DVAUDIO_DECODER 0
|
||||
#define CONFIG_DVVIDEO_DECODER 0
|
||||
#define CONFIG_DXA_DECODER 0
|
||||
#define CONFIG_DXTORY_DECODER 0
|
||||
@ -746,6 +747,7 @@
|
||||
#define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
#define CONFIG_MPEG4_DECODER 0
|
||||
#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
#define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
#define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
#define CONFIG_MPEGVIDEO_DECODER 0
|
||||
#define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1322,7 +1324,6 @@
|
||||
#define CONFIG_LIBGME_DEMUXER 0
|
||||
#define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
#define CONFIG_LIBNUT_DEMUXER 0
|
||||
#define CONFIG_LIBQUVI_DEMUXER 0
|
||||
#define CONFIG_A64MULTI_ENCODER 0
|
||||
#define CONFIG_A64MULTI5_ENCODER 0
|
||||
#define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1390,6 +1391,7 @@
|
||||
#define CONFIG_V308_ENCODER 0
|
||||
#define CONFIG_V408_ENCODER 0
|
||||
#define CONFIG_V410_ENCODER 0
|
||||
#define CONFIG_VC2_ENCODER 0
|
||||
#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
#define CONFIG_WMV1_ENCODER 0
|
||||
#define CONFIG_WMV2_ENCODER 0
|
||||
@ -1479,7 +1481,6 @@
|
||||
#define CONFIG_LIBTHEORA_ENCODER 0
|
||||
#define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
#define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
#define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
#define CONFIG_LIBVORBIS_ENCODER 0
|
||||
#define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1493,7 +1494,6 @@
|
||||
#define CONFIG_LIBX265_ENCODER 0
|
||||
#define CONFIG_LIBXAVS_ENCODER 0
|
||||
#define CONFIG_LIBXVID_ENCODER 0
|
||||
#define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
#define CONFIG_LIBOPENH264_ENCODER 0
|
||||
#define CONFIG_H264_QSV_ENCODER 0
|
||||
#define CONFIG_NVENC_ENCODER 0
|
||||
@ -1509,12 +1509,14 @@
|
||||
#define CONFIG_AEMPHASIS_FILTER 0
|
||||
#define CONFIG_AEVAL_FILTER 0
|
||||
#define CONFIG_AFADE_FILTER 0
|
||||
#define CONFIG_AFFTFILT_FILTER 0
|
||||
#define CONFIG_AFORMAT_FILTER 0
|
||||
#define CONFIG_AGATE_FILTER 0
|
||||
#define CONFIG_AINTERLEAVE_FILTER 0
|
||||
#define CONFIG_ALIMITER_FILTER 0
|
||||
#define CONFIG_ALLPASS_FILTER 0
|
||||
#define CONFIG_AMERGE_FILTER 0
|
||||
#define CONFIG_AMETADATA_FILTER 0
|
||||
#define CONFIG_AMIX_FILTER 0
|
||||
#define CONFIG_ANEQUALIZER_FILTER 0
|
||||
#define CONFIG_ANULL_FILTER 0
|
||||
@ -1534,6 +1536,7 @@
|
||||
#define CONFIG_ASHOWINFO_FILTER 0
|
||||
#define CONFIG_ASPLIT_FILTER 0
|
||||
#define CONFIG_ASTATS_FILTER 0
|
||||
#define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
#define CONFIG_ASYNCTS_FILTER 0
|
||||
#define CONFIG_ATEMPO_FILTER 0
|
||||
#define CONFIG_ATRIM_FILTER 0
|
||||
@ -1597,6 +1600,7 @@
|
||||
#define CONFIG_COLORKEY_FILTER 0
|
||||
#define CONFIG_COLORLEVELS_FILTER 0
|
||||
#define CONFIG_COLORMATRIX_FILTER 0
|
||||
#define CONFIG_CONVOLUTION_FILTER 0
|
||||
#define CONFIG_COPY_FILTER 0
|
||||
#define CONFIG_COVER_RECT_FILTER 0
|
||||
#define CONFIG_CROP_FILTER 0
|
||||
@ -1658,8 +1662,10 @@
|
||||
#define CONFIG_MASKEDMERGE_FILTER 0
|
||||
#define CONFIG_MCDEINT_FILTER 0
|
||||
#define CONFIG_MERGEPLANES_FILTER 0
|
||||
#define CONFIG_METADATA_FILTER 0
|
||||
#define CONFIG_MPDECIMATE_FILTER 0
|
||||
#define CONFIG_NEGATE_FILTER 0
|
||||
#define CONFIG_NNEDI_FILTER 0
|
||||
#define CONFIG_NOFORMAT_FILTER 0
|
||||
#define CONFIG_NOISE_FILTER 0
|
||||
#define CONFIG_NULL_FILTER 0
|
||||
@ -1708,8 +1714,10 @@
|
||||
#define CONFIG_SPP_FILTER 0
|
||||
#define CONFIG_SSIM_FILTER 0
|
||||
#define CONFIG_STEREO3D_FILTER 0
|
||||
#define CONFIG_STREAMSELECT_FILTER 0
|
||||
#define CONFIG_SUBTITLES_FILTER 0
|
||||
#define CONFIG_SUPER2XSAI_FILTER 0
|
||||
#define CONFIG_SWAPRECT_FILTER 0
|
||||
#define CONFIG_SWAPUV_FILTER 0
|
||||
#define CONFIG_TBLEND_FILTER 0
|
||||
#define CONFIG_TELECINE_FILTER 0
|
||||
@ -1750,6 +1758,7 @@
|
||||
#define CONFIG_TESTSRC2_FILTER 0
|
||||
#define CONFIG_NULLSINK_FILTER 0
|
||||
#define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
#define CONFIG_AHISTOGRAM_FILTER 0
|
||||
#define CONFIG_APHASEMETER_FILTER 0
|
||||
#define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
#define CONFIG_CONCAT_FILTER 0
|
||||
@ -1760,6 +1769,7 @@
|
||||
#define CONFIG_SHOWVOLUME_FILTER 0
|
||||
#define CONFIG_SHOWWAVES_FILTER 0
|
||||
#define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
#define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
#define CONFIG_AMOVIE_FILTER 0
|
||||
#define CONFIG_MOVIE_FILTER 0
|
||||
#define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1789,6 +1799,7 @@
|
||||
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
#define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1994,6 +2005,7 @@
|
||||
#define CONFIG_DIRAC_PARSER 0
|
||||
#define CONFIG_DNXHD_PARSER 0
|
||||
#define CONFIG_DPX_PARSER 0
|
||||
#define CONFIG_DVAUDIO_PARSER 0
|
||||
#define CONFIG_DVBSUB_PARSER 0
|
||||
#define CONFIG_DVDSUB_PARSER 0
|
||||
#define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -201,6 +201,7 @@
|
||||
%define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
%define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
%define HAVE_MALLOC_H 0
|
||||
%define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
%define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -234,6 +235,7 @@
|
||||
%define HAVE_EXP2F 1
|
||||
%define HAVE_EXPF 1
|
||||
%define HAVE_HYPOT 1
|
||||
%define HAVE_ISFINITE 1
|
||||
%define HAVE_ISINF 1
|
||||
%define HAVE_ISNAN 1
|
||||
%define HAVE_LDEXPF 1
|
||||
@ -319,9 +321,9 @@
|
||||
%define HAVE_GNU_AS 0
|
||||
%define HAVE_GNU_WINDRES 0
|
||||
%define HAVE_IBM_ASM 0
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
%define HAVE_INLINE_ASM_LABELS 1
|
||||
%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
%define HAVE_PRAGMA_DEPRECATED 1
|
||||
%define HAVE_RSYNC_CONTIMEOUT 0
|
||||
%define HAVE_SYMVER_ASM_LABEL 1
|
||||
@ -345,9 +347,8 @@
|
||||
%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
|
||||
%define HAVE_ATOMICS_NATIVE 1
|
||||
%define HAVE_DOS_PATHS 0
|
||||
%define HAVE_DXVA2API_COBJ 0
|
||||
%define HAVE_DXVA2_LIB 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_DXVA2API_COBJ 0
|
||||
%define HAVE_LIBC_MSVCRT 0
|
||||
%define HAVE_LIBDC1394_1 0
|
||||
%define HAVE_LIBDC1394_2 0
|
||||
@ -361,6 +362,7 @@
|
||||
%define HAVE_THREADS 1
|
||||
%define HAVE_VAAPI_X11 0
|
||||
%define HAVE_VDPAU_X11 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_XLIB 0
|
||||
%define CONFIG_BSFS 0
|
||||
%define CONFIG_DECODERS 1
|
||||
@ -405,7 +407,6 @@
|
||||
%define CONFIG_GNUTLS 0
|
||||
%define CONFIG_ICONV 0
|
||||
%define CONFIG_LADSPA 0
|
||||
%define CONFIG_LIBAACPLUS 0
|
||||
%define CONFIG_LIBASS 0
|
||||
%define CONFIG_LIBBLURAY 0
|
||||
%define CONFIG_LIBBS2B 0
|
||||
@ -436,7 +437,6 @@
|
||||
%define CONFIG_LIBOPENJPEG 0
|
||||
%define CONFIG_LIBOPUS 0
|
||||
%define CONFIG_LIBPULSE 0
|
||||
%define CONFIG_LIBQUVI 0
|
||||
%define CONFIG_LIBRTMP 0
|
||||
%define CONFIG_LIBRUBBERBAND 0
|
||||
%define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -452,7 +452,6 @@
|
||||
%define CONFIG_LIBUTVIDEO 0
|
||||
%define CONFIG_LIBV4L2 0
|
||||
%define CONFIG_LIBVIDSTAB 0
|
||||
%define CONFIG_LIBVO_AACENC 0
|
||||
%define CONFIG_LIBVO_AMRWBENC 0
|
||||
%define CONFIG_LIBVORBIS 0
|
||||
%define CONFIG_LIBVPX 0
|
||||
@ -572,8 +571,8 @@
|
||||
%define CONFIG_INTRAX8 0
|
||||
%define CONFIG_IVIDSP 0
|
||||
%define CONFIG_JPEGTABLES 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LGPLV3 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LLAUDDSP 0
|
||||
%define CONFIG_LLVIDDSP 0
|
||||
%define CONFIG_LPC 0
|
||||
@ -648,6 +647,7 @@
|
||||
%define CONFIG_CAVS_DECODER 0
|
||||
%define CONFIG_CDGRAPHICS_DECODER 0
|
||||
%define CONFIG_CDXL_DECODER 0
|
||||
%define CONFIG_CFHD_DECODER 0
|
||||
%define CONFIG_CINEPAK_DECODER 0
|
||||
%define CONFIG_CLJR_DECODER 0
|
||||
%define CONFIG_CLLC_DECODER 0
|
||||
@ -661,6 +661,7 @@
|
||||
%define CONFIG_DNXHD_DECODER 0
|
||||
%define CONFIG_DPX_DECODER 0
|
||||
%define CONFIG_DSICINVIDEO_DECODER 0
|
||||
%define CONFIG_DVAUDIO_DECODER 0
|
||||
%define CONFIG_DVVIDEO_DECODER 0
|
||||
%define CONFIG_DXA_DECODER 0
|
||||
%define CONFIG_DXTORY_DECODER 0
|
||||
@ -730,6 +731,7 @@
|
||||
%define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
%define CONFIG_MPEG4_DECODER 0
|
||||
%define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
%define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
%define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
%define CONFIG_MPEGVIDEO_DECODER 0
|
||||
%define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1306,7 +1308,6 @@
|
||||
%define CONFIG_LIBGME_DEMUXER 0
|
||||
%define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
%define CONFIG_LIBNUT_DEMUXER 0
|
||||
%define CONFIG_LIBQUVI_DEMUXER 0
|
||||
%define CONFIG_A64MULTI_ENCODER 0
|
||||
%define CONFIG_A64MULTI5_ENCODER 0
|
||||
%define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1374,6 +1375,7 @@
|
||||
%define CONFIG_V308_ENCODER 0
|
||||
%define CONFIG_V408_ENCODER 0
|
||||
%define CONFIG_V410_ENCODER 0
|
||||
%define CONFIG_VC2_ENCODER 0
|
||||
%define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
%define CONFIG_WMV1_ENCODER 0
|
||||
%define CONFIG_WMV2_ENCODER 0
|
||||
@ -1463,7 +1465,6 @@
|
||||
%define CONFIG_LIBTHEORA_ENCODER 0
|
||||
%define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
%define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
%define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
%define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
%define CONFIG_LIBVORBIS_ENCODER 0
|
||||
%define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1477,7 +1478,6 @@
|
||||
%define CONFIG_LIBX265_ENCODER 0
|
||||
%define CONFIG_LIBXAVS_ENCODER 0
|
||||
%define CONFIG_LIBXVID_ENCODER 0
|
||||
%define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
%define CONFIG_LIBOPENH264_ENCODER 0
|
||||
%define CONFIG_H264_QSV_ENCODER 0
|
||||
%define CONFIG_NVENC_ENCODER 0
|
||||
@ -1493,12 +1493,14 @@
|
||||
%define CONFIG_AEMPHASIS_FILTER 0
|
||||
%define CONFIG_AEVAL_FILTER 0
|
||||
%define CONFIG_AFADE_FILTER 0
|
||||
%define CONFIG_AFFTFILT_FILTER 0
|
||||
%define CONFIG_AFORMAT_FILTER 0
|
||||
%define CONFIG_AGATE_FILTER 0
|
||||
%define CONFIG_AINTERLEAVE_FILTER 0
|
||||
%define CONFIG_ALIMITER_FILTER 0
|
||||
%define CONFIG_ALLPASS_FILTER 0
|
||||
%define CONFIG_AMERGE_FILTER 0
|
||||
%define CONFIG_AMETADATA_FILTER 0
|
||||
%define CONFIG_AMIX_FILTER 0
|
||||
%define CONFIG_ANEQUALIZER_FILTER 0
|
||||
%define CONFIG_ANULL_FILTER 0
|
||||
@ -1518,6 +1520,7 @@
|
||||
%define CONFIG_ASHOWINFO_FILTER 0
|
||||
%define CONFIG_ASPLIT_FILTER 0
|
||||
%define CONFIG_ASTATS_FILTER 0
|
||||
%define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
%define CONFIG_ASYNCTS_FILTER 0
|
||||
%define CONFIG_ATEMPO_FILTER 0
|
||||
%define CONFIG_ATRIM_FILTER 0
|
||||
@ -1581,6 +1584,7 @@
|
||||
%define CONFIG_COLORKEY_FILTER 0
|
||||
%define CONFIG_COLORLEVELS_FILTER 0
|
||||
%define CONFIG_COLORMATRIX_FILTER 0
|
||||
%define CONFIG_CONVOLUTION_FILTER 0
|
||||
%define CONFIG_COPY_FILTER 0
|
||||
%define CONFIG_COVER_RECT_FILTER 0
|
||||
%define CONFIG_CROP_FILTER 0
|
||||
@ -1642,8 +1646,10 @@
|
||||
%define CONFIG_MASKEDMERGE_FILTER 0
|
||||
%define CONFIG_MCDEINT_FILTER 0
|
||||
%define CONFIG_MERGEPLANES_FILTER 0
|
||||
%define CONFIG_METADATA_FILTER 0
|
||||
%define CONFIG_MPDECIMATE_FILTER 0
|
||||
%define CONFIG_NEGATE_FILTER 0
|
||||
%define CONFIG_NNEDI_FILTER 0
|
||||
%define CONFIG_NOFORMAT_FILTER 0
|
||||
%define CONFIG_NOISE_FILTER 0
|
||||
%define CONFIG_NULL_FILTER 0
|
||||
@ -1692,8 +1698,10 @@
|
||||
%define CONFIG_SPP_FILTER 0
|
||||
%define CONFIG_SSIM_FILTER 0
|
||||
%define CONFIG_STEREO3D_FILTER 0
|
||||
%define CONFIG_STREAMSELECT_FILTER 0
|
||||
%define CONFIG_SUBTITLES_FILTER 0
|
||||
%define CONFIG_SUPER2XSAI_FILTER 0
|
||||
%define CONFIG_SWAPRECT_FILTER 0
|
||||
%define CONFIG_SWAPUV_FILTER 0
|
||||
%define CONFIG_TBLEND_FILTER 0
|
||||
%define CONFIG_TELECINE_FILTER 0
|
||||
@ -1734,6 +1742,7 @@
|
||||
%define CONFIG_TESTSRC2_FILTER 0
|
||||
%define CONFIG_NULLSINK_FILTER 0
|
||||
%define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
%define CONFIG_AHISTOGRAM_FILTER 0
|
||||
%define CONFIG_APHASEMETER_FILTER 0
|
||||
%define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
%define CONFIG_CONCAT_FILTER 0
|
||||
@ -1744,6 +1753,7 @@
|
||||
%define CONFIG_SHOWVOLUME_FILTER 0
|
||||
%define CONFIG_SHOWWAVES_FILTER 0
|
||||
%define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
%define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
%define CONFIG_AMOVIE_FILTER 0
|
||||
%define CONFIG_MOVIE_FILTER 0
|
||||
%define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1773,6 +1783,7 @@
|
||||
%define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
%define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1978,6 +1989,7 @@
|
||||
%define CONFIG_DIRAC_PARSER 0
|
||||
%define CONFIG_DNXHD_PARSER 0
|
||||
%define CONFIG_DPX_PARSER 0
|
||||
%define CONFIG_DVAUDIO_PARSER 0
|
||||
%define CONFIG_DVBSUB_PARSER 0
|
||||
%define CONFIG_DVDSUB_PARSER 0
|
||||
%define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -217,6 +217,7 @@
|
||||
#define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
#define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
#define HAVE_MALLOC_H 0
|
||||
#define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -250,6 +251,7 @@
|
||||
#define HAVE_EXP2F 1
|
||||
#define HAVE_EXPF 1
|
||||
#define HAVE_HYPOT 1
|
||||
#define HAVE_ISFINITE 1
|
||||
#define HAVE_ISINF 1
|
||||
#define HAVE_ISNAN 1
|
||||
#define HAVE_LDEXPF 1
|
||||
@ -335,9 +337,9 @@
|
||||
#define HAVE_GNU_AS 0
|
||||
#define HAVE_GNU_WINDRES 0
|
||||
#define HAVE_IBM_ASM 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_INLINE_ASM_LABELS 1
|
||||
#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_PRAGMA_DEPRECATED 1
|
||||
#define HAVE_RSYNC_CONTIMEOUT 0
|
||||
#define HAVE_SYMVER_ASM_LABEL 1
|
||||
@ -361,9 +363,8 @@
|
||||
#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
|
||||
#define HAVE_ATOMICS_NATIVE 1
|
||||
#define HAVE_DOS_PATHS 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_DXVA2_LIB 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#define HAVE_LIBDC1394_1 0
|
||||
#define HAVE_LIBDC1394_2 0
|
||||
@ -377,6 +378,7 @@
|
||||
#define HAVE_THREADS 1
|
||||
#define HAVE_VAAPI_X11 0
|
||||
#define HAVE_VDPAU_X11 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_XLIB 0
|
||||
#define CONFIG_BSFS 0
|
||||
#define CONFIG_DECODERS 1
|
||||
@ -421,7 +423,6 @@
|
||||
#define CONFIG_GNUTLS 0
|
||||
#define CONFIG_ICONV 0
|
||||
#define CONFIG_LADSPA 0
|
||||
#define CONFIG_LIBAACPLUS 0
|
||||
#define CONFIG_LIBASS 0
|
||||
#define CONFIG_LIBBLURAY 0
|
||||
#define CONFIG_LIBBS2B 0
|
||||
@ -452,7 +453,6 @@
|
||||
#define CONFIG_LIBOPENJPEG 0
|
||||
#define CONFIG_LIBOPUS 0
|
||||
#define CONFIG_LIBPULSE 0
|
||||
#define CONFIG_LIBQUVI 0
|
||||
#define CONFIG_LIBRTMP 0
|
||||
#define CONFIG_LIBRUBBERBAND 0
|
||||
#define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -468,7 +468,6 @@
|
||||
#define CONFIG_LIBUTVIDEO 0
|
||||
#define CONFIG_LIBV4L2 0
|
||||
#define CONFIG_LIBVIDSTAB 0
|
||||
#define CONFIG_LIBVO_AACENC 0
|
||||
#define CONFIG_LIBVO_AMRWBENC 0
|
||||
#define CONFIG_LIBVORBIS 0
|
||||
#define CONFIG_LIBVPX 0
|
||||
@ -588,8 +587,8 @@
|
||||
#define CONFIG_INTRAX8 0
|
||||
#define CONFIG_IVIDSP 0
|
||||
#define CONFIG_JPEGTABLES 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LGPLV3 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LLAUDDSP 0
|
||||
#define CONFIG_LLVIDDSP 0
|
||||
#define CONFIG_LPC 0
|
||||
@ -664,6 +663,7 @@
|
||||
#define CONFIG_CAVS_DECODER 0
|
||||
#define CONFIG_CDGRAPHICS_DECODER 0
|
||||
#define CONFIG_CDXL_DECODER 0
|
||||
#define CONFIG_CFHD_DECODER 0
|
||||
#define CONFIG_CINEPAK_DECODER 0
|
||||
#define CONFIG_CLJR_DECODER 0
|
||||
#define CONFIG_CLLC_DECODER 0
|
||||
@ -677,6 +677,7 @@
|
||||
#define CONFIG_DNXHD_DECODER 0
|
||||
#define CONFIG_DPX_DECODER 0
|
||||
#define CONFIG_DSICINVIDEO_DECODER 0
|
||||
#define CONFIG_DVAUDIO_DECODER 0
|
||||
#define CONFIG_DVVIDEO_DECODER 0
|
||||
#define CONFIG_DXA_DECODER 0
|
||||
#define CONFIG_DXTORY_DECODER 0
|
||||
@ -746,6 +747,7 @@
|
||||
#define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
#define CONFIG_MPEG4_DECODER 0
|
||||
#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
#define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
#define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
#define CONFIG_MPEGVIDEO_DECODER 0
|
||||
#define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1322,7 +1324,6 @@
|
||||
#define CONFIG_LIBGME_DEMUXER 0
|
||||
#define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
#define CONFIG_LIBNUT_DEMUXER 0
|
||||
#define CONFIG_LIBQUVI_DEMUXER 0
|
||||
#define CONFIG_A64MULTI_ENCODER 0
|
||||
#define CONFIG_A64MULTI5_ENCODER 0
|
||||
#define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1390,6 +1391,7 @@
|
||||
#define CONFIG_V308_ENCODER 0
|
||||
#define CONFIG_V408_ENCODER 0
|
||||
#define CONFIG_V410_ENCODER 0
|
||||
#define CONFIG_VC2_ENCODER 0
|
||||
#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
#define CONFIG_WMV1_ENCODER 0
|
||||
#define CONFIG_WMV2_ENCODER 0
|
||||
@ -1479,7 +1481,6 @@
|
||||
#define CONFIG_LIBTHEORA_ENCODER 0
|
||||
#define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
#define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
#define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
#define CONFIG_LIBVORBIS_ENCODER 0
|
||||
#define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1493,7 +1494,6 @@
|
||||
#define CONFIG_LIBX265_ENCODER 0
|
||||
#define CONFIG_LIBXAVS_ENCODER 0
|
||||
#define CONFIG_LIBXVID_ENCODER 0
|
||||
#define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
#define CONFIG_LIBOPENH264_ENCODER 0
|
||||
#define CONFIG_H264_QSV_ENCODER 0
|
||||
#define CONFIG_NVENC_ENCODER 0
|
||||
@ -1509,12 +1509,14 @@
|
||||
#define CONFIG_AEMPHASIS_FILTER 0
|
||||
#define CONFIG_AEVAL_FILTER 0
|
||||
#define CONFIG_AFADE_FILTER 0
|
||||
#define CONFIG_AFFTFILT_FILTER 0
|
||||
#define CONFIG_AFORMAT_FILTER 0
|
||||
#define CONFIG_AGATE_FILTER 0
|
||||
#define CONFIG_AINTERLEAVE_FILTER 0
|
||||
#define CONFIG_ALIMITER_FILTER 0
|
||||
#define CONFIG_ALLPASS_FILTER 0
|
||||
#define CONFIG_AMERGE_FILTER 0
|
||||
#define CONFIG_AMETADATA_FILTER 0
|
||||
#define CONFIG_AMIX_FILTER 0
|
||||
#define CONFIG_ANEQUALIZER_FILTER 0
|
||||
#define CONFIG_ANULL_FILTER 0
|
||||
@ -1534,6 +1536,7 @@
|
||||
#define CONFIG_ASHOWINFO_FILTER 0
|
||||
#define CONFIG_ASPLIT_FILTER 0
|
||||
#define CONFIG_ASTATS_FILTER 0
|
||||
#define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
#define CONFIG_ASYNCTS_FILTER 0
|
||||
#define CONFIG_ATEMPO_FILTER 0
|
||||
#define CONFIG_ATRIM_FILTER 0
|
||||
@ -1597,6 +1600,7 @@
|
||||
#define CONFIG_COLORKEY_FILTER 0
|
||||
#define CONFIG_COLORLEVELS_FILTER 0
|
||||
#define CONFIG_COLORMATRIX_FILTER 0
|
||||
#define CONFIG_CONVOLUTION_FILTER 0
|
||||
#define CONFIG_COPY_FILTER 0
|
||||
#define CONFIG_COVER_RECT_FILTER 0
|
||||
#define CONFIG_CROP_FILTER 0
|
||||
@ -1658,8 +1662,10 @@
|
||||
#define CONFIG_MASKEDMERGE_FILTER 0
|
||||
#define CONFIG_MCDEINT_FILTER 0
|
||||
#define CONFIG_MERGEPLANES_FILTER 0
|
||||
#define CONFIG_METADATA_FILTER 0
|
||||
#define CONFIG_MPDECIMATE_FILTER 0
|
||||
#define CONFIG_NEGATE_FILTER 0
|
||||
#define CONFIG_NNEDI_FILTER 0
|
||||
#define CONFIG_NOFORMAT_FILTER 0
|
||||
#define CONFIG_NOISE_FILTER 0
|
||||
#define CONFIG_NULL_FILTER 0
|
||||
@ -1708,8 +1714,10 @@
|
||||
#define CONFIG_SPP_FILTER 0
|
||||
#define CONFIG_SSIM_FILTER 0
|
||||
#define CONFIG_STEREO3D_FILTER 0
|
||||
#define CONFIG_STREAMSELECT_FILTER 0
|
||||
#define CONFIG_SUBTITLES_FILTER 0
|
||||
#define CONFIG_SUPER2XSAI_FILTER 0
|
||||
#define CONFIG_SWAPRECT_FILTER 0
|
||||
#define CONFIG_SWAPUV_FILTER 0
|
||||
#define CONFIG_TBLEND_FILTER 0
|
||||
#define CONFIG_TELECINE_FILTER 0
|
||||
@ -1750,6 +1758,7 @@
|
||||
#define CONFIG_TESTSRC2_FILTER 0
|
||||
#define CONFIG_NULLSINK_FILTER 0
|
||||
#define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
#define CONFIG_AHISTOGRAM_FILTER 0
|
||||
#define CONFIG_APHASEMETER_FILTER 0
|
||||
#define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
#define CONFIG_CONCAT_FILTER 0
|
||||
@ -1760,6 +1769,7 @@
|
||||
#define CONFIG_SHOWVOLUME_FILTER 0
|
||||
#define CONFIG_SHOWWAVES_FILTER 0
|
||||
#define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
#define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
#define CONFIG_AMOVIE_FILTER 0
|
||||
#define CONFIG_MOVIE_FILTER 0
|
||||
#define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1789,6 +1799,7 @@
|
||||
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
#define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1994,6 +2005,7 @@
|
||||
#define CONFIG_DIRAC_PARSER 0
|
||||
#define CONFIG_DNXHD_PARSER 0
|
||||
#define CONFIG_DPX_PARSER 0
|
||||
#define CONFIG_DVAUDIO_PARSER 0
|
||||
#define CONFIG_DVBSUB_PARSER 0
|
||||
#define CONFIG_DVDSUB_PARSER 0
|
||||
#define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
/* Automatically generated by configure - do not modify! */
|
||||
#ifndef FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-asm --disable-yasm --disable-avx2 --cc='gcc -m32'"
|
||||
#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-asm --enable-yasm --disable-asm --disable-yasm --cc='gcc -m32'"
|
||||
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||||
#define CONFIG_THIS_YEAR 2016
|
||||
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||||
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
|
||||
#define CC_IDENT "gcc 4.8 (Ubuntu 4.8.2-19ubuntu1)"
|
||||
#define CC_IDENT "gcc 4.6 (Ubuntu/Linaro 4.6.3-1ubuntu5)"
|
||||
#define av_restrict restrict
|
||||
#define EXTERN_PREFIX ""
|
||||
#define EXTERN_ASM
|
||||
@ -179,7 +179,7 @@
|
||||
#define HAVE_ATOMICS_SUNCC 0
|
||||
#define HAVE_ATOMICS_WIN32 0
|
||||
#define HAVE_ATOMIC_CAS_PTR 0
|
||||
#define HAVE_ATOMIC_COMPARE_EXCHANGE 1
|
||||
#define HAVE_ATOMIC_COMPARE_EXCHANGE 0
|
||||
#define HAVE_MACHINE_RW_BARRIER 0
|
||||
#define HAVE_MEMORYBARRIER 0
|
||||
#define HAVE_MM_EMPTY 0
|
||||
@ -217,6 +217,7 @@
|
||||
#define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
#define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
#define HAVE_MALLOC_H 1
|
||||
#define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -250,6 +251,7 @@
|
||||
#define HAVE_EXP2F 1
|
||||
#define HAVE_EXPF 1
|
||||
#define HAVE_HYPOT 1
|
||||
#define HAVE_ISFINITE 1
|
||||
#define HAVE_ISINF 1
|
||||
#define HAVE_ISNAN 1
|
||||
#define HAVE_LDEXPF 1
|
||||
@ -335,9 +337,9 @@
|
||||
#define HAVE_GNU_AS 0
|
||||
#define HAVE_GNU_WINDRES 0
|
||||
#define HAVE_IBM_ASM 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_INLINE_ASM_LABELS 1
|
||||
#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_PRAGMA_DEPRECATED 1
|
||||
#define HAVE_RSYNC_CONTIMEOUT 1
|
||||
#define HAVE_SYMVER_ASM_LABEL 0
|
||||
@ -361,9 +363,8 @@
|
||||
#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
|
||||
#define HAVE_ATOMICS_NATIVE 1
|
||||
#define HAVE_DOS_PATHS 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_DXVA2_LIB 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#define HAVE_LIBDC1394_1 0
|
||||
#define HAVE_LIBDC1394_2 0
|
||||
@ -373,10 +374,11 @@
|
||||
#define HAVE_POD2MAN 1
|
||||
#define HAVE_SDL 0
|
||||
#define HAVE_SECTION_DATA_REL_RO 1
|
||||
#define HAVE_TEXI2HTML 1
|
||||
#define HAVE_TEXI2HTML 0
|
||||
#define HAVE_THREADS 1
|
||||
#define HAVE_VAAPI_X11 0
|
||||
#define HAVE_VDPAU_X11 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_XLIB 0
|
||||
#define CONFIG_BSFS 0
|
||||
#define CONFIG_DECODERS 1
|
||||
@ -390,7 +392,7 @@
|
||||
#define CONFIG_MUXERS 0
|
||||
#define CONFIG_PROTOCOLS 0
|
||||
#define CONFIG_DOC 0
|
||||
#define CONFIG_HTMLPAGES 1
|
||||
#define CONFIG_HTMLPAGES 0
|
||||
#define CONFIG_MANPAGES 1
|
||||
#define CONFIG_PODPAGES 1
|
||||
#define CONFIG_TXTPAGES 0
|
||||
@ -421,7 +423,6 @@
|
||||
#define CONFIG_GNUTLS 0
|
||||
#define CONFIG_ICONV 0
|
||||
#define CONFIG_LADSPA 0
|
||||
#define CONFIG_LIBAACPLUS 0
|
||||
#define CONFIG_LIBASS 0
|
||||
#define CONFIG_LIBBLURAY 0
|
||||
#define CONFIG_LIBBS2B 0
|
||||
@ -452,7 +453,6 @@
|
||||
#define CONFIG_LIBOPENJPEG 0
|
||||
#define CONFIG_LIBOPUS 0
|
||||
#define CONFIG_LIBPULSE 0
|
||||
#define CONFIG_LIBQUVI 0
|
||||
#define CONFIG_LIBRTMP 0
|
||||
#define CONFIG_LIBRUBBERBAND 0
|
||||
#define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -468,7 +468,6 @@
|
||||
#define CONFIG_LIBUTVIDEO 0
|
||||
#define CONFIG_LIBV4L2 0
|
||||
#define CONFIG_LIBVIDSTAB 0
|
||||
#define CONFIG_LIBVO_AACENC 0
|
||||
#define CONFIG_LIBVO_AMRWBENC 0
|
||||
#define CONFIG_LIBVORBIS 0
|
||||
#define CONFIG_LIBVPX 0
|
||||
@ -514,7 +513,7 @@
|
||||
#define CONFIG_VDA 0
|
||||
#define CONFIG_VDPAU 0
|
||||
#define CONFIG_VIDEOTOOLBOX 0
|
||||
#define CONFIG_XVMC 1
|
||||
#define CONFIG_XVMC 0
|
||||
#define CONFIG_GPL 0
|
||||
#define CONFIG_NONFREE 0
|
||||
#define CONFIG_VERSION3 0
|
||||
@ -588,8 +587,8 @@
|
||||
#define CONFIG_INTRAX8 0
|
||||
#define CONFIG_IVIDSP 0
|
||||
#define CONFIG_JPEGTABLES 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LGPLV3 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LLAUDDSP 0
|
||||
#define CONFIG_LLVIDDSP 0
|
||||
#define CONFIG_LPC 0
|
||||
@ -664,6 +663,7 @@
|
||||
#define CONFIG_CAVS_DECODER 0
|
||||
#define CONFIG_CDGRAPHICS_DECODER 0
|
||||
#define CONFIG_CDXL_DECODER 0
|
||||
#define CONFIG_CFHD_DECODER 0
|
||||
#define CONFIG_CINEPAK_DECODER 0
|
||||
#define CONFIG_CLJR_DECODER 0
|
||||
#define CONFIG_CLLC_DECODER 0
|
||||
@ -677,6 +677,7 @@
|
||||
#define CONFIG_DNXHD_DECODER 0
|
||||
#define CONFIG_DPX_DECODER 0
|
||||
#define CONFIG_DSICINVIDEO_DECODER 0
|
||||
#define CONFIG_DVAUDIO_DECODER 0
|
||||
#define CONFIG_DVVIDEO_DECODER 0
|
||||
#define CONFIG_DXA_DECODER 0
|
||||
#define CONFIG_DXTORY_DECODER 0
|
||||
@ -746,6 +747,7 @@
|
||||
#define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
#define CONFIG_MPEG4_DECODER 0
|
||||
#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
#define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
#define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
#define CONFIG_MPEGVIDEO_DECODER 0
|
||||
#define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1322,7 +1324,6 @@
|
||||
#define CONFIG_LIBGME_DEMUXER 0
|
||||
#define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
#define CONFIG_LIBNUT_DEMUXER 0
|
||||
#define CONFIG_LIBQUVI_DEMUXER 0
|
||||
#define CONFIG_A64MULTI_ENCODER 0
|
||||
#define CONFIG_A64MULTI5_ENCODER 0
|
||||
#define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1390,6 +1391,7 @@
|
||||
#define CONFIG_V308_ENCODER 0
|
||||
#define CONFIG_V408_ENCODER 0
|
||||
#define CONFIG_V410_ENCODER 0
|
||||
#define CONFIG_VC2_ENCODER 0
|
||||
#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
#define CONFIG_WMV1_ENCODER 0
|
||||
#define CONFIG_WMV2_ENCODER 0
|
||||
@ -1479,7 +1481,6 @@
|
||||
#define CONFIG_LIBTHEORA_ENCODER 0
|
||||
#define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
#define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
#define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
#define CONFIG_LIBVORBIS_ENCODER 0
|
||||
#define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1493,7 +1494,6 @@
|
||||
#define CONFIG_LIBX265_ENCODER 0
|
||||
#define CONFIG_LIBXAVS_ENCODER 0
|
||||
#define CONFIG_LIBXVID_ENCODER 0
|
||||
#define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
#define CONFIG_LIBOPENH264_ENCODER 0
|
||||
#define CONFIG_H264_QSV_ENCODER 0
|
||||
#define CONFIG_NVENC_ENCODER 0
|
||||
@ -1509,12 +1509,14 @@
|
||||
#define CONFIG_AEMPHASIS_FILTER 0
|
||||
#define CONFIG_AEVAL_FILTER 0
|
||||
#define CONFIG_AFADE_FILTER 0
|
||||
#define CONFIG_AFFTFILT_FILTER 0
|
||||
#define CONFIG_AFORMAT_FILTER 0
|
||||
#define CONFIG_AGATE_FILTER 0
|
||||
#define CONFIG_AINTERLEAVE_FILTER 0
|
||||
#define CONFIG_ALIMITER_FILTER 0
|
||||
#define CONFIG_ALLPASS_FILTER 0
|
||||
#define CONFIG_AMERGE_FILTER 0
|
||||
#define CONFIG_AMETADATA_FILTER 0
|
||||
#define CONFIG_AMIX_FILTER 0
|
||||
#define CONFIG_ANEQUALIZER_FILTER 0
|
||||
#define CONFIG_ANULL_FILTER 0
|
||||
@ -1534,6 +1536,7 @@
|
||||
#define CONFIG_ASHOWINFO_FILTER 0
|
||||
#define CONFIG_ASPLIT_FILTER 0
|
||||
#define CONFIG_ASTATS_FILTER 0
|
||||
#define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
#define CONFIG_ASYNCTS_FILTER 0
|
||||
#define CONFIG_ATEMPO_FILTER 0
|
||||
#define CONFIG_ATRIM_FILTER 0
|
||||
@ -1597,6 +1600,7 @@
|
||||
#define CONFIG_COLORKEY_FILTER 0
|
||||
#define CONFIG_COLORLEVELS_FILTER 0
|
||||
#define CONFIG_COLORMATRIX_FILTER 0
|
||||
#define CONFIG_CONVOLUTION_FILTER 0
|
||||
#define CONFIG_COPY_FILTER 0
|
||||
#define CONFIG_COVER_RECT_FILTER 0
|
||||
#define CONFIG_CROP_FILTER 0
|
||||
@ -1658,8 +1662,10 @@
|
||||
#define CONFIG_MASKEDMERGE_FILTER 0
|
||||
#define CONFIG_MCDEINT_FILTER 0
|
||||
#define CONFIG_MERGEPLANES_FILTER 0
|
||||
#define CONFIG_METADATA_FILTER 0
|
||||
#define CONFIG_MPDECIMATE_FILTER 0
|
||||
#define CONFIG_NEGATE_FILTER 0
|
||||
#define CONFIG_NNEDI_FILTER 0
|
||||
#define CONFIG_NOFORMAT_FILTER 0
|
||||
#define CONFIG_NOISE_FILTER 0
|
||||
#define CONFIG_NULL_FILTER 0
|
||||
@ -1708,8 +1714,10 @@
|
||||
#define CONFIG_SPP_FILTER 0
|
||||
#define CONFIG_SSIM_FILTER 0
|
||||
#define CONFIG_STEREO3D_FILTER 0
|
||||
#define CONFIG_STREAMSELECT_FILTER 0
|
||||
#define CONFIG_SUBTITLES_FILTER 0
|
||||
#define CONFIG_SUPER2XSAI_FILTER 0
|
||||
#define CONFIG_SWAPRECT_FILTER 0
|
||||
#define CONFIG_SWAPUV_FILTER 0
|
||||
#define CONFIG_TBLEND_FILTER 0
|
||||
#define CONFIG_TELECINE_FILTER 0
|
||||
@ -1750,6 +1758,7 @@
|
||||
#define CONFIG_TESTSRC2_FILTER 0
|
||||
#define CONFIG_NULLSINK_FILTER 0
|
||||
#define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
#define CONFIG_AHISTOGRAM_FILTER 0
|
||||
#define CONFIG_APHASEMETER_FILTER 0
|
||||
#define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
#define CONFIG_CONCAT_FILTER 0
|
||||
@ -1760,6 +1769,7 @@
|
||||
#define CONFIG_SHOWVOLUME_FILTER 0
|
||||
#define CONFIG_SHOWWAVES_FILTER 0
|
||||
#define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
#define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
#define CONFIG_AMOVIE_FILTER 0
|
||||
#define CONFIG_MOVIE_FILTER 0
|
||||
#define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1789,6 +1799,7 @@
|
||||
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
#define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1994,6 +2005,7 @@
|
||||
#define CONFIG_DIRAC_PARSER 0
|
||||
#define CONFIG_DNXHD_PARSER 0
|
||||
#define CONFIG_DPX_PARSER 0
|
||||
#define CONFIG_DVAUDIO_PARSER 0
|
||||
#define CONFIG_DVBSUB_PARSER 0
|
||||
#define CONFIG_DVDSUB_PARSER 0
|
||||
#define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
%define HAVE_ATOMICS_SUNCC 0
|
||||
%define HAVE_ATOMICS_WIN32 0
|
||||
%define HAVE_ATOMIC_CAS_PTR 0
|
||||
%define HAVE_ATOMIC_COMPARE_EXCHANGE 1
|
||||
%define HAVE_ATOMIC_COMPARE_EXCHANGE 0
|
||||
%define HAVE_MACHINE_RW_BARRIER 0
|
||||
%define HAVE_MEMORYBARRIER 0
|
||||
%define HAVE_MM_EMPTY 1
|
||||
@ -201,6 +201,7 @@
|
||||
%define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
%define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
%define HAVE_MALLOC_H 1
|
||||
%define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
%define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -234,6 +235,7 @@
|
||||
%define HAVE_EXP2F 1
|
||||
%define HAVE_EXPF 1
|
||||
%define HAVE_HYPOT 1
|
||||
%define HAVE_ISFINITE 1
|
||||
%define HAVE_ISINF 1
|
||||
%define HAVE_ISNAN 1
|
||||
%define HAVE_LDEXPF 1
|
||||
@ -319,9 +321,9 @@
|
||||
%define HAVE_GNU_AS 0
|
||||
%define HAVE_GNU_WINDRES 0
|
||||
%define HAVE_IBM_ASM 0
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
%define HAVE_INLINE_ASM_LABELS 1
|
||||
%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
%define HAVE_PRAGMA_DEPRECATED 1
|
||||
%define HAVE_RSYNC_CONTIMEOUT 1
|
||||
%define HAVE_SYMVER_ASM_LABEL 0
|
||||
@ -345,9 +347,8 @@
|
||||
%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
|
||||
%define HAVE_ATOMICS_NATIVE 1
|
||||
%define HAVE_DOS_PATHS 0
|
||||
%define HAVE_DXVA2API_COBJ 0
|
||||
%define HAVE_DXVA2_LIB 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_DXVA2API_COBJ 0
|
||||
%define HAVE_LIBC_MSVCRT 0
|
||||
%define HAVE_LIBDC1394_1 0
|
||||
%define HAVE_LIBDC1394_2 0
|
||||
@ -357,10 +358,11 @@
|
||||
%define HAVE_POD2MAN 1
|
||||
%define HAVE_SDL 0
|
||||
%define HAVE_SECTION_DATA_REL_RO 1
|
||||
%define HAVE_TEXI2HTML 1
|
||||
%define HAVE_TEXI2HTML 0
|
||||
%define HAVE_THREADS 1
|
||||
%define HAVE_VAAPI_X11 0
|
||||
%define HAVE_VDPAU_X11 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_XLIB 1
|
||||
%define CONFIG_BSFS 0
|
||||
%define CONFIG_DECODERS 1
|
||||
@ -374,7 +376,7 @@
|
||||
%define CONFIG_MUXERS 0
|
||||
%define CONFIG_PROTOCOLS 0
|
||||
%define CONFIG_DOC 0
|
||||
%define CONFIG_HTMLPAGES 1
|
||||
%define CONFIG_HTMLPAGES 0
|
||||
%define CONFIG_MANPAGES 1
|
||||
%define CONFIG_PODPAGES 1
|
||||
%define CONFIG_TXTPAGES 0
|
||||
@ -405,7 +407,6 @@
|
||||
%define CONFIG_GNUTLS 0
|
||||
%define CONFIG_ICONV 0
|
||||
%define CONFIG_LADSPA 0
|
||||
%define CONFIG_LIBAACPLUS 0
|
||||
%define CONFIG_LIBASS 0
|
||||
%define CONFIG_LIBBLURAY 0
|
||||
%define CONFIG_LIBBS2B 0
|
||||
@ -436,7 +437,6 @@
|
||||
%define CONFIG_LIBOPENJPEG 0
|
||||
%define CONFIG_LIBOPUS 0
|
||||
%define CONFIG_LIBPULSE 0
|
||||
%define CONFIG_LIBQUVI 0
|
||||
%define CONFIG_LIBRTMP 0
|
||||
%define CONFIG_LIBRUBBERBAND 0
|
||||
%define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -452,7 +452,6 @@
|
||||
%define CONFIG_LIBUTVIDEO 0
|
||||
%define CONFIG_LIBV4L2 0
|
||||
%define CONFIG_LIBVIDSTAB 0
|
||||
%define CONFIG_LIBVO_AACENC 0
|
||||
%define CONFIG_LIBVO_AMRWBENC 0
|
||||
%define CONFIG_LIBVORBIS 0
|
||||
%define CONFIG_LIBVPX 0
|
||||
@ -498,7 +497,7 @@
|
||||
%define CONFIG_VDA 0
|
||||
%define CONFIG_VDPAU 0
|
||||
%define CONFIG_VIDEOTOOLBOX 0
|
||||
%define CONFIG_XVMC 1
|
||||
%define CONFIG_XVMC 0
|
||||
%define CONFIG_GPL 0
|
||||
%define CONFIG_NONFREE 0
|
||||
%define CONFIG_VERSION3 0
|
||||
@ -572,8 +571,8 @@
|
||||
%define CONFIG_INTRAX8 0
|
||||
%define CONFIG_IVIDSP 0
|
||||
%define CONFIG_JPEGTABLES 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LGPLV3 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LLAUDDSP 0
|
||||
%define CONFIG_LLVIDDSP 0
|
||||
%define CONFIG_LPC 0
|
||||
@ -648,6 +647,7 @@
|
||||
%define CONFIG_CAVS_DECODER 0
|
||||
%define CONFIG_CDGRAPHICS_DECODER 0
|
||||
%define CONFIG_CDXL_DECODER 0
|
||||
%define CONFIG_CFHD_DECODER 0
|
||||
%define CONFIG_CINEPAK_DECODER 0
|
||||
%define CONFIG_CLJR_DECODER 0
|
||||
%define CONFIG_CLLC_DECODER 0
|
||||
@ -661,6 +661,7 @@
|
||||
%define CONFIG_DNXHD_DECODER 0
|
||||
%define CONFIG_DPX_DECODER 0
|
||||
%define CONFIG_DSICINVIDEO_DECODER 0
|
||||
%define CONFIG_DVAUDIO_DECODER 0
|
||||
%define CONFIG_DVVIDEO_DECODER 0
|
||||
%define CONFIG_DXA_DECODER 0
|
||||
%define CONFIG_DXTORY_DECODER 0
|
||||
@ -730,6 +731,7 @@
|
||||
%define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
%define CONFIG_MPEG4_DECODER 0
|
||||
%define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
%define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
%define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
%define CONFIG_MPEGVIDEO_DECODER 0
|
||||
%define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1306,7 +1308,6 @@
|
||||
%define CONFIG_LIBGME_DEMUXER 0
|
||||
%define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
%define CONFIG_LIBNUT_DEMUXER 0
|
||||
%define CONFIG_LIBQUVI_DEMUXER 0
|
||||
%define CONFIG_A64MULTI_ENCODER 0
|
||||
%define CONFIG_A64MULTI5_ENCODER 0
|
||||
%define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1374,6 +1375,7 @@
|
||||
%define CONFIG_V308_ENCODER 0
|
||||
%define CONFIG_V408_ENCODER 0
|
||||
%define CONFIG_V410_ENCODER 0
|
||||
%define CONFIG_VC2_ENCODER 0
|
||||
%define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
%define CONFIG_WMV1_ENCODER 0
|
||||
%define CONFIG_WMV2_ENCODER 0
|
||||
@ -1463,7 +1465,6 @@
|
||||
%define CONFIG_LIBTHEORA_ENCODER 0
|
||||
%define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
%define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
%define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
%define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
%define CONFIG_LIBVORBIS_ENCODER 0
|
||||
%define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1477,7 +1478,6 @@
|
||||
%define CONFIG_LIBX265_ENCODER 0
|
||||
%define CONFIG_LIBXAVS_ENCODER 0
|
||||
%define CONFIG_LIBXVID_ENCODER 0
|
||||
%define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
%define CONFIG_LIBOPENH264_ENCODER 0
|
||||
%define CONFIG_H264_QSV_ENCODER 0
|
||||
%define CONFIG_NVENC_ENCODER 0
|
||||
@ -1493,12 +1493,14 @@
|
||||
%define CONFIG_AEMPHASIS_FILTER 0
|
||||
%define CONFIG_AEVAL_FILTER 0
|
||||
%define CONFIG_AFADE_FILTER 0
|
||||
%define CONFIG_AFFTFILT_FILTER 0
|
||||
%define CONFIG_AFORMAT_FILTER 0
|
||||
%define CONFIG_AGATE_FILTER 0
|
||||
%define CONFIG_AINTERLEAVE_FILTER 0
|
||||
%define CONFIG_ALIMITER_FILTER 0
|
||||
%define CONFIG_ALLPASS_FILTER 0
|
||||
%define CONFIG_AMERGE_FILTER 0
|
||||
%define CONFIG_AMETADATA_FILTER 0
|
||||
%define CONFIG_AMIX_FILTER 0
|
||||
%define CONFIG_ANEQUALIZER_FILTER 0
|
||||
%define CONFIG_ANULL_FILTER 0
|
||||
@ -1518,6 +1520,7 @@
|
||||
%define CONFIG_ASHOWINFO_FILTER 0
|
||||
%define CONFIG_ASPLIT_FILTER 0
|
||||
%define CONFIG_ASTATS_FILTER 0
|
||||
%define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
%define CONFIG_ASYNCTS_FILTER 0
|
||||
%define CONFIG_ATEMPO_FILTER 0
|
||||
%define CONFIG_ATRIM_FILTER 0
|
||||
@ -1581,6 +1584,7 @@
|
||||
%define CONFIG_COLORKEY_FILTER 0
|
||||
%define CONFIG_COLORLEVELS_FILTER 0
|
||||
%define CONFIG_COLORMATRIX_FILTER 0
|
||||
%define CONFIG_CONVOLUTION_FILTER 0
|
||||
%define CONFIG_COPY_FILTER 0
|
||||
%define CONFIG_COVER_RECT_FILTER 0
|
||||
%define CONFIG_CROP_FILTER 0
|
||||
@ -1642,8 +1646,10 @@
|
||||
%define CONFIG_MASKEDMERGE_FILTER 0
|
||||
%define CONFIG_MCDEINT_FILTER 0
|
||||
%define CONFIG_MERGEPLANES_FILTER 0
|
||||
%define CONFIG_METADATA_FILTER 0
|
||||
%define CONFIG_MPDECIMATE_FILTER 0
|
||||
%define CONFIG_NEGATE_FILTER 0
|
||||
%define CONFIG_NNEDI_FILTER 0
|
||||
%define CONFIG_NOFORMAT_FILTER 0
|
||||
%define CONFIG_NOISE_FILTER 0
|
||||
%define CONFIG_NULL_FILTER 0
|
||||
@ -1692,8 +1698,10 @@
|
||||
%define CONFIG_SPP_FILTER 0
|
||||
%define CONFIG_SSIM_FILTER 0
|
||||
%define CONFIG_STEREO3D_FILTER 0
|
||||
%define CONFIG_STREAMSELECT_FILTER 0
|
||||
%define CONFIG_SUBTITLES_FILTER 0
|
||||
%define CONFIG_SUPER2XSAI_FILTER 0
|
||||
%define CONFIG_SWAPRECT_FILTER 0
|
||||
%define CONFIG_SWAPUV_FILTER 0
|
||||
%define CONFIG_TBLEND_FILTER 0
|
||||
%define CONFIG_TELECINE_FILTER 0
|
||||
@ -1734,6 +1742,7 @@
|
||||
%define CONFIG_TESTSRC2_FILTER 0
|
||||
%define CONFIG_NULLSINK_FILTER 0
|
||||
%define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
%define CONFIG_AHISTOGRAM_FILTER 0
|
||||
%define CONFIG_APHASEMETER_FILTER 0
|
||||
%define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
%define CONFIG_CONCAT_FILTER 0
|
||||
@ -1744,6 +1753,7 @@
|
||||
%define CONFIG_SHOWVOLUME_FILTER 0
|
||||
%define CONFIG_SHOWWAVES_FILTER 0
|
||||
%define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
%define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
%define CONFIG_AMOVIE_FILTER 0
|
||||
%define CONFIG_MOVIE_FILTER 0
|
||||
%define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1773,6 +1783,7 @@
|
||||
%define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
%define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1978,6 +1989,7 @@
|
||||
%define CONFIG_DIRAC_PARSER 0
|
||||
%define CONFIG_DNXHD_PARSER 0
|
||||
%define CONFIG_DPX_PARSER 0
|
||||
%define CONFIG_DVAUDIO_PARSER 0
|
||||
%define CONFIG_DVBSUB_PARSER 0
|
||||
%define CONFIG_DVDSUB_PARSER 0
|
||||
%define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
/* Automatically generated by configure - do not modify! */
|
||||
#ifndef FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-avx2"
|
||||
#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-asm --enable-yasm --disable-avx2"
|
||||
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||||
#define CONFIG_THIS_YEAR 2016
|
||||
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||||
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
|
||||
#define CC_IDENT "gcc 4.8 (Ubuntu 4.8.2-19ubuntu1)"
|
||||
#define CC_IDENT "gcc 4.6 (Ubuntu/Linaro 4.6.3-1ubuntu5)"
|
||||
#define av_restrict restrict
|
||||
#define EXTERN_PREFIX ""
|
||||
#define EXTERN_ASM
|
||||
@ -179,7 +179,7 @@
|
||||
#define HAVE_ATOMICS_SUNCC 0
|
||||
#define HAVE_ATOMICS_WIN32 0
|
||||
#define HAVE_ATOMIC_CAS_PTR 0
|
||||
#define HAVE_ATOMIC_COMPARE_EXCHANGE 1
|
||||
#define HAVE_ATOMIC_COMPARE_EXCHANGE 0
|
||||
#define HAVE_MACHINE_RW_BARRIER 0
|
||||
#define HAVE_MEMORYBARRIER 0
|
||||
#define HAVE_MM_EMPTY 1
|
||||
@ -217,6 +217,7 @@
|
||||
#define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
#define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
#define HAVE_MALLOC_H 1
|
||||
#define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -250,6 +251,7 @@
|
||||
#define HAVE_EXP2F 1
|
||||
#define HAVE_EXPF 1
|
||||
#define HAVE_HYPOT 1
|
||||
#define HAVE_ISFINITE 1
|
||||
#define HAVE_ISINF 1
|
||||
#define HAVE_ISNAN 1
|
||||
#define HAVE_LDEXPF 1
|
||||
@ -335,9 +337,9 @@
|
||||
#define HAVE_GNU_AS 0
|
||||
#define HAVE_GNU_WINDRES 0
|
||||
#define HAVE_IBM_ASM 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_INLINE_ASM_LABELS 1
|
||||
#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
|
||||
#define HAVE_PRAGMA_DEPRECATED 1
|
||||
#define HAVE_RSYNC_CONTIMEOUT 1
|
||||
#define HAVE_SYMVER_ASM_LABEL 0
|
||||
@ -361,9 +363,8 @@
|
||||
#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
|
||||
#define HAVE_ATOMICS_NATIVE 1
|
||||
#define HAVE_DOS_PATHS 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_DXVA2_LIB 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_DXVA2API_COBJ 0
|
||||
#define HAVE_LIBC_MSVCRT 0
|
||||
#define HAVE_LIBDC1394_1 0
|
||||
#define HAVE_LIBDC1394_2 0
|
||||
@ -373,10 +374,11 @@
|
||||
#define HAVE_POD2MAN 1
|
||||
#define HAVE_SDL 0
|
||||
#define HAVE_SECTION_DATA_REL_RO 1
|
||||
#define HAVE_TEXI2HTML 1
|
||||
#define HAVE_TEXI2HTML 0
|
||||
#define HAVE_THREADS 1
|
||||
#define HAVE_VAAPI_X11 0
|
||||
#define HAVE_VDPAU_X11 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_XLIB 1
|
||||
#define CONFIG_BSFS 0
|
||||
#define CONFIG_DECODERS 1
|
||||
@ -390,7 +392,7 @@
|
||||
#define CONFIG_MUXERS 0
|
||||
#define CONFIG_PROTOCOLS 0
|
||||
#define CONFIG_DOC 0
|
||||
#define CONFIG_HTMLPAGES 1
|
||||
#define CONFIG_HTMLPAGES 0
|
||||
#define CONFIG_MANPAGES 1
|
||||
#define CONFIG_PODPAGES 1
|
||||
#define CONFIG_TXTPAGES 0
|
||||
@ -421,7 +423,6 @@
|
||||
#define CONFIG_GNUTLS 0
|
||||
#define CONFIG_ICONV 0
|
||||
#define CONFIG_LADSPA 0
|
||||
#define CONFIG_LIBAACPLUS 0
|
||||
#define CONFIG_LIBASS 0
|
||||
#define CONFIG_LIBBLURAY 0
|
||||
#define CONFIG_LIBBS2B 0
|
||||
@ -452,7 +453,6 @@
|
||||
#define CONFIG_LIBOPENJPEG 0
|
||||
#define CONFIG_LIBOPUS 0
|
||||
#define CONFIG_LIBPULSE 0
|
||||
#define CONFIG_LIBQUVI 0
|
||||
#define CONFIG_LIBRTMP 0
|
||||
#define CONFIG_LIBRUBBERBAND 0
|
||||
#define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -468,7 +468,6 @@
|
||||
#define CONFIG_LIBUTVIDEO 0
|
||||
#define CONFIG_LIBV4L2 0
|
||||
#define CONFIG_LIBVIDSTAB 0
|
||||
#define CONFIG_LIBVO_AACENC 0
|
||||
#define CONFIG_LIBVO_AMRWBENC 0
|
||||
#define CONFIG_LIBVORBIS 0
|
||||
#define CONFIG_LIBVPX 0
|
||||
@ -514,7 +513,7 @@
|
||||
#define CONFIG_VDA 0
|
||||
#define CONFIG_VDPAU 0
|
||||
#define CONFIG_VIDEOTOOLBOX 0
|
||||
#define CONFIG_XVMC 1
|
||||
#define CONFIG_XVMC 0
|
||||
#define CONFIG_GPL 0
|
||||
#define CONFIG_NONFREE 0
|
||||
#define CONFIG_VERSION3 0
|
||||
@ -588,8 +587,8 @@
|
||||
#define CONFIG_INTRAX8 0
|
||||
#define CONFIG_IVIDSP 0
|
||||
#define CONFIG_JPEGTABLES 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LGPLV3 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LLAUDDSP 0
|
||||
#define CONFIG_LLVIDDSP 0
|
||||
#define CONFIG_LPC 0
|
||||
@ -664,6 +663,7 @@
|
||||
#define CONFIG_CAVS_DECODER 0
|
||||
#define CONFIG_CDGRAPHICS_DECODER 0
|
||||
#define CONFIG_CDXL_DECODER 0
|
||||
#define CONFIG_CFHD_DECODER 0
|
||||
#define CONFIG_CINEPAK_DECODER 0
|
||||
#define CONFIG_CLJR_DECODER 0
|
||||
#define CONFIG_CLLC_DECODER 0
|
||||
@ -677,6 +677,7 @@
|
||||
#define CONFIG_DNXHD_DECODER 0
|
||||
#define CONFIG_DPX_DECODER 0
|
||||
#define CONFIG_DSICINVIDEO_DECODER 0
|
||||
#define CONFIG_DVAUDIO_DECODER 0
|
||||
#define CONFIG_DVVIDEO_DECODER 0
|
||||
#define CONFIG_DXA_DECODER 0
|
||||
#define CONFIG_DXTORY_DECODER 0
|
||||
@ -746,6 +747,7 @@
|
||||
#define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
#define CONFIG_MPEG4_DECODER 0
|
||||
#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
#define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
#define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
#define CONFIG_MPEGVIDEO_DECODER 0
|
||||
#define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1322,7 +1324,6 @@
|
||||
#define CONFIG_LIBGME_DEMUXER 0
|
||||
#define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
#define CONFIG_LIBNUT_DEMUXER 0
|
||||
#define CONFIG_LIBQUVI_DEMUXER 0
|
||||
#define CONFIG_A64MULTI_ENCODER 0
|
||||
#define CONFIG_A64MULTI5_ENCODER 0
|
||||
#define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1390,6 +1391,7 @@
|
||||
#define CONFIG_V308_ENCODER 0
|
||||
#define CONFIG_V408_ENCODER 0
|
||||
#define CONFIG_V410_ENCODER 0
|
||||
#define CONFIG_VC2_ENCODER 0
|
||||
#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
#define CONFIG_WMV1_ENCODER 0
|
||||
#define CONFIG_WMV2_ENCODER 0
|
||||
@ -1479,7 +1481,6 @@
|
||||
#define CONFIG_LIBTHEORA_ENCODER 0
|
||||
#define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
#define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
#define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
#define CONFIG_LIBVORBIS_ENCODER 0
|
||||
#define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1493,7 +1494,6 @@
|
||||
#define CONFIG_LIBX265_ENCODER 0
|
||||
#define CONFIG_LIBXAVS_ENCODER 0
|
||||
#define CONFIG_LIBXVID_ENCODER 0
|
||||
#define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
#define CONFIG_LIBOPENH264_ENCODER 0
|
||||
#define CONFIG_H264_QSV_ENCODER 0
|
||||
#define CONFIG_NVENC_ENCODER 0
|
||||
@ -1509,12 +1509,14 @@
|
||||
#define CONFIG_AEMPHASIS_FILTER 0
|
||||
#define CONFIG_AEVAL_FILTER 0
|
||||
#define CONFIG_AFADE_FILTER 0
|
||||
#define CONFIG_AFFTFILT_FILTER 0
|
||||
#define CONFIG_AFORMAT_FILTER 0
|
||||
#define CONFIG_AGATE_FILTER 0
|
||||
#define CONFIG_AINTERLEAVE_FILTER 0
|
||||
#define CONFIG_ALIMITER_FILTER 0
|
||||
#define CONFIG_ALLPASS_FILTER 0
|
||||
#define CONFIG_AMERGE_FILTER 0
|
||||
#define CONFIG_AMETADATA_FILTER 0
|
||||
#define CONFIG_AMIX_FILTER 0
|
||||
#define CONFIG_ANEQUALIZER_FILTER 0
|
||||
#define CONFIG_ANULL_FILTER 0
|
||||
@ -1534,6 +1536,7 @@
|
||||
#define CONFIG_ASHOWINFO_FILTER 0
|
||||
#define CONFIG_ASPLIT_FILTER 0
|
||||
#define CONFIG_ASTATS_FILTER 0
|
||||
#define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
#define CONFIG_ASYNCTS_FILTER 0
|
||||
#define CONFIG_ATEMPO_FILTER 0
|
||||
#define CONFIG_ATRIM_FILTER 0
|
||||
@ -1597,6 +1600,7 @@
|
||||
#define CONFIG_COLORKEY_FILTER 0
|
||||
#define CONFIG_COLORLEVELS_FILTER 0
|
||||
#define CONFIG_COLORMATRIX_FILTER 0
|
||||
#define CONFIG_CONVOLUTION_FILTER 0
|
||||
#define CONFIG_COPY_FILTER 0
|
||||
#define CONFIG_COVER_RECT_FILTER 0
|
||||
#define CONFIG_CROP_FILTER 0
|
||||
@ -1658,8 +1662,10 @@
|
||||
#define CONFIG_MASKEDMERGE_FILTER 0
|
||||
#define CONFIG_MCDEINT_FILTER 0
|
||||
#define CONFIG_MERGEPLANES_FILTER 0
|
||||
#define CONFIG_METADATA_FILTER 0
|
||||
#define CONFIG_MPDECIMATE_FILTER 0
|
||||
#define CONFIG_NEGATE_FILTER 0
|
||||
#define CONFIG_NNEDI_FILTER 0
|
||||
#define CONFIG_NOFORMAT_FILTER 0
|
||||
#define CONFIG_NOISE_FILTER 0
|
||||
#define CONFIG_NULL_FILTER 0
|
||||
@ -1708,8 +1714,10 @@
|
||||
#define CONFIG_SPP_FILTER 0
|
||||
#define CONFIG_SSIM_FILTER 0
|
||||
#define CONFIG_STEREO3D_FILTER 0
|
||||
#define CONFIG_STREAMSELECT_FILTER 0
|
||||
#define CONFIG_SUBTITLES_FILTER 0
|
||||
#define CONFIG_SUPER2XSAI_FILTER 0
|
||||
#define CONFIG_SWAPRECT_FILTER 0
|
||||
#define CONFIG_SWAPUV_FILTER 0
|
||||
#define CONFIG_TBLEND_FILTER 0
|
||||
#define CONFIG_TELECINE_FILTER 0
|
||||
@ -1750,6 +1758,7 @@
|
||||
#define CONFIG_TESTSRC2_FILTER 0
|
||||
#define CONFIG_NULLSINK_FILTER 0
|
||||
#define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
#define CONFIG_AHISTOGRAM_FILTER 0
|
||||
#define CONFIG_APHASEMETER_FILTER 0
|
||||
#define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
#define CONFIG_CONCAT_FILTER 0
|
||||
@ -1760,6 +1769,7 @@
|
||||
#define CONFIG_SHOWVOLUME_FILTER 0
|
||||
#define CONFIG_SHOWWAVES_FILTER 0
|
||||
#define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
#define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
#define CONFIG_AMOVIE_FILTER 0
|
||||
#define CONFIG_MOVIE_FILTER 0
|
||||
#define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1789,6 +1799,7 @@
|
||||
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
#define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1994,6 +2005,7 @@
|
||||
#define CONFIG_DIRAC_PARSER 0
|
||||
#define CONFIG_DNXHD_PARSER 0
|
||||
#define CONFIG_DPX_PARSER 0
|
||||
#define CONFIG_DVAUDIO_PARSER 0
|
||||
#define CONFIG_DVBSUB_PARSER 0
|
||||
#define CONFIG_DVDSUB_PARSER 0
|
||||
#define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -201,6 +201,7 @@
|
||||
%define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
%define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
%define HAVE_MALLOC_H 1
|
||||
%define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
%define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -234,6 +235,7 @@
|
||||
%define HAVE_EXP2F 1
|
||||
%define HAVE_EXPF 1
|
||||
%define HAVE_HYPOT 1
|
||||
%define HAVE_ISFINITE 1
|
||||
%define HAVE_ISINF 1
|
||||
%define HAVE_ISNAN 1
|
||||
%define HAVE_LDEXPF 1
|
||||
@ -319,9 +321,9 @@
|
||||
%define HAVE_GNU_AS 0
|
||||
%define HAVE_GNU_WINDRES 0
|
||||
%define HAVE_IBM_ASM 0
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
%define HAVE_INLINE_ASM_LABELS 0
|
||||
%define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
%define HAVE_PRAGMA_DEPRECATED 1
|
||||
%define HAVE_RSYNC_CONTIMEOUT 0
|
||||
%define HAVE_SYMVER_ASM_LABEL 0
|
||||
@ -345,9 +347,8 @@
|
||||
%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
|
||||
%define HAVE_ATOMICS_NATIVE 1
|
||||
%define HAVE_DOS_PATHS 1
|
||||
%define HAVE_DXVA2API_COBJ 1
|
||||
%define HAVE_DXVA2_LIB 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_DXVA2API_COBJ 1
|
||||
%define HAVE_LIBC_MSVCRT 1
|
||||
%define HAVE_LIBDC1394_1 0
|
||||
%define HAVE_LIBDC1394_2 0
|
||||
@ -361,6 +362,7 @@
|
||||
%define HAVE_THREADS 1
|
||||
%define HAVE_VAAPI_X11 0
|
||||
%define HAVE_VDPAU_X11 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_XLIB 0
|
||||
%define CONFIG_BSFS 0
|
||||
%define CONFIG_DECODERS 1
|
||||
@ -405,7 +407,6 @@
|
||||
%define CONFIG_GNUTLS 0
|
||||
%define CONFIG_ICONV 0
|
||||
%define CONFIG_LADSPA 0
|
||||
%define CONFIG_LIBAACPLUS 0
|
||||
%define CONFIG_LIBASS 0
|
||||
%define CONFIG_LIBBLURAY 0
|
||||
%define CONFIG_LIBBS2B 0
|
||||
@ -436,7 +437,6 @@
|
||||
%define CONFIG_LIBOPENJPEG 0
|
||||
%define CONFIG_LIBOPUS 0
|
||||
%define CONFIG_LIBPULSE 0
|
||||
%define CONFIG_LIBQUVI 0
|
||||
%define CONFIG_LIBRTMP 0
|
||||
%define CONFIG_LIBRUBBERBAND 0
|
||||
%define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -452,7 +452,6 @@
|
||||
%define CONFIG_LIBUTVIDEO 0
|
||||
%define CONFIG_LIBV4L2 0
|
||||
%define CONFIG_LIBVIDSTAB 0
|
||||
%define CONFIG_LIBVO_AACENC 0
|
||||
%define CONFIG_LIBVO_AMRWBENC 0
|
||||
%define CONFIG_LIBVORBIS 0
|
||||
%define CONFIG_LIBVPX 0
|
||||
@ -572,8 +571,8 @@
|
||||
%define CONFIG_INTRAX8 0
|
||||
%define CONFIG_IVIDSP 0
|
||||
%define CONFIG_JPEGTABLES 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LGPLV3 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LLAUDDSP 0
|
||||
%define CONFIG_LLVIDDSP 0
|
||||
%define CONFIG_LPC 0
|
||||
@ -648,6 +647,7 @@
|
||||
%define CONFIG_CAVS_DECODER 0
|
||||
%define CONFIG_CDGRAPHICS_DECODER 0
|
||||
%define CONFIG_CDXL_DECODER 0
|
||||
%define CONFIG_CFHD_DECODER 0
|
||||
%define CONFIG_CINEPAK_DECODER 0
|
||||
%define CONFIG_CLJR_DECODER 0
|
||||
%define CONFIG_CLLC_DECODER 0
|
||||
@ -661,6 +661,7 @@
|
||||
%define CONFIG_DNXHD_DECODER 0
|
||||
%define CONFIG_DPX_DECODER 0
|
||||
%define CONFIG_DSICINVIDEO_DECODER 0
|
||||
%define CONFIG_DVAUDIO_DECODER 0
|
||||
%define CONFIG_DVVIDEO_DECODER 0
|
||||
%define CONFIG_DXA_DECODER 0
|
||||
%define CONFIG_DXTORY_DECODER 0
|
||||
@ -730,6 +731,7 @@
|
||||
%define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
%define CONFIG_MPEG4_DECODER 0
|
||||
%define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
%define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
%define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
%define CONFIG_MPEGVIDEO_DECODER 0
|
||||
%define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1306,7 +1308,6 @@
|
||||
%define CONFIG_LIBGME_DEMUXER 0
|
||||
%define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
%define CONFIG_LIBNUT_DEMUXER 0
|
||||
%define CONFIG_LIBQUVI_DEMUXER 0
|
||||
%define CONFIG_A64MULTI_ENCODER 0
|
||||
%define CONFIG_A64MULTI5_ENCODER 0
|
||||
%define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1374,6 +1375,7 @@
|
||||
%define CONFIG_V308_ENCODER 0
|
||||
%define CONFIG_V408_ENCODER 0
|
||||
%define CONFIG_V410_ENCODER 0
|
||||
%define CONFIG_VC2_ENCODER 0
|
||||
%define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
%define CONFIG_WMV1_ENCODER 0
|
||||
%define CONFIG_WMV2_ENCODER 0
|
||||
@ -1463,7 +1465,6 @@
|
||||
%define CONFIG_LIBTHEORA_ENCODER 0
|
||||
%define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
%define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
%define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
%define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
%define CONFIG_LIBVORBIS_ENCODER 0
|
||||
%define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1477,7 +1478,6 @@
|
||||
%define CONFIG_LIBX265_ENCODER 0
|
||||
%define CONFIG_LIBXAVS_ENCODER 0
|
||||
%define CONFIG_LIBXVID_ENCODER 0
|
||||
%define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
%define CONFIG_LIBOPENH264_ENCODER 0
|
||||
%define CONFIG_H264_QSV_ENCODER 0
|
||||
%define CONFIG_NVENC_ENCODER 0
|
||||
@ -1493,12 +1493,14 @@
|
||||
%define CONFIG_AEMPHASIS_FILTER 0
|
||||
%define CONFIG_AEVAL_FILTER 0
|
||||
%define CONFIG_AFADE_FILTER 0
|
||||
%define CONFIG_AFFTFILT_FILTER 0
|
||||
%define CONFIG_AFORMAT_FILTER 0
|
||||
%define CONFIG_AGATE_FILTER 0
|
||||
%define CONFIG_AINTERLEAVE_FILTER 0
|
||||
%define CONFIG_ALIMITER_FILTER 0
|
||||
%define CONFIG_ALLPASS_FILTER 0
|
||||
%define CONFIG_AMERGE_FILTER 0
|
||||
%define CONFIG_AMETADATA_FILTER 0
|
||||
%define CONFIG_AMIX_FILTER 0
|
||||
%define CONFIG_ANEQUALIZER_FILTER 0
|
||||
%define CONFIG_ANULL_FILTER 0
|
||||
@ -1518,6 +1520,7 @@
|
||||
%define CONFIG_ASHOWINFO_FILTER 0
|
||||
%define CONFIG_ASPLIT_FILTER 0
|
||||
%define CONFIG_ASTATS_FILTER 0
|
||||
%define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
%define CONFIG_ASYNCTS_FILTER 0
|
||||
%define CONFIG_ATEMPO_FILTER 0
|
||||
%define CONFIG_ATRIM_FILTER 0
|
||||
@ -1581,6 +1584,7 @@
|
||||
%define CONFIG_COLORKEY_FILTER 0
|
||||
%define CONFIG_COLORLEVELS_FILTER 0
|
||||
%define CONFIG_COLORMATRIX_FILTER 0
|
||||
%define CONFIG_CONVOLUTION_FILTER 0
|
||||
%define CONFIG_COPY_FILTER 0
|
||||
%define CONFIG_COVER_RECT_FILTER 0
|
||||
%define CONFIG_CROP_FILTER 0
|
||||
@ -1642,8 +1646,10 @@
|
||||
%define CONFIG_MASKEDMERGE_FILTER 0
|
||||
%define CONFIG_MCDEINT_FILTER 0
|
||||
%define CONFIG_MERGEPLANES_FILTER 0
|
||||
%define CONFIG_METADATA_FILTER 0
|
||||
%define CONFIG_MPDECIMATE_FILTER 0
|
||||
%define CONFIG_NEGATE_FILTER 0
|
||||
%define CONFIG_NNEDI_FILTER 0
|
||||
%define CONFIG_NOFORMAT_FILTER 0
|
||||
%define CONFIG_NOISE_FILTER 0
|
||||
%define CONFIG_NULL_FILTER 0
|
||||
@ -1692,8 +1698,10 @@
|
||||
%define CONFIG_SPP_FILTER 0
|
||||
%define CONFIG_SSIM_FILTER 0
|
||||
%define CONFIG_STEREO3D_FILTER 0
|
||||
%define CONFIG_STREAMSELECT_FILTER 0
|
||||
%define CONFIG_SUBTITLES_FILTER 0
|
||||
%define CONFIG_SUPER2XSAI_FILTER 0
|
||||
%define CONFIG_SWAPRECT_FILTER 0
|
||||
%define CONFIG_SWAPUV_FILTER 0
|
||||
%define CONFIG_TBLEND_FILTER 0
|
||||
%define CONFIG_TELECINE_FILTER 0
|
||||
@ -1734,6 +1742,7 @@
|
||||
%define CONFIG_TESTSRC2_FILTER 0
|
||||
%define CONFIG_NULLSINK_FILTER 0
|
||||
%define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
%define CONFIG_AHISTOGRAM_FILTER 0
|
||||
%define CONFIG_APHASEMETER_FILTER 0
|
||||
%define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
%define CONFIG_CONCAT_FILTER 0
|
||||
@ -1744,6 +1753,7 @@
|
||||
%define CONFIG_SHOWVOLUME_FILTER 0
|
||||
%define CONFIG_SHOWWAVES_FILTER 0
|
||||
%define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
%define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
%define CONFIG_AMOVIE_FILTER 0
|
||||
%define CONFIG_MOVIE_FILTER 0
|
||||
%define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1773,6 +1783,7 @@
|
||||
%define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
%define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1978,6 +1989,7 @@
|
||||
%define CONFIG_DIRAC_PARSER 0
|
||||
%define CONFIG_DNXHD_PARSER 0
|
||||
%define CONFIG_DPX_PARSER 0
|
||||
%define CONFIG_DVAUDIO_PARSER 0
|
||||
%define CONFIG_DVBSUB_PARSER 0
|
||||
%define CONFIG_DVDSUB_PARSER 0
|
||||
%define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#define CONFIG_THIS_YEAR 2016
|
||||
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||||
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
|
||||
#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.40629 for x86"
|
||||
#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.00.23506 for x86"
|
||||
#define av_restrict __restrict
|
||||
#define EXTERN_PREFIX "_"
|
||||
#define EXTERN_ASM _
|
||||
@ -217,6 +217,7 @@
|
||||
#define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
#define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
#define HAVE_MALLOC_H 1
|
||||
#define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -250,6 +251,7 @@
|
||||
#define HAVE_EXP2F 1
|
||||
#define HAVE_EXPF 1
|
||||
#define HAVE_HYPOT 1
|
||||
#define HAVE_ISFINITE 1
|
||||
#define HAVE_ISINF 1
|
||||
#define HAVE_ISNAN 1
|
||||
#define HAVE_LDEXPF 1
|
||||
@ -335,9 +337,9 @@
|
||||
#define HAVE_GNU_AS 0
|
||||
#define HAVE_GNU_WINDRES 0
|
||||
#define HAVE_IBM_ASM 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
#define HAVE_INLINE_ASM_LABELS 0
|
||||
#define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
#define HAVE_PRAGMA_DEPRECATED 1
|
||||
#define HAVE_RSYNC_CONTIMEOUT 0
|
||||
#define HAVE_SYMVER_ASM_LABEL 0
|
||||
@ -361,9 +363,8 @@
|
||||
#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
|
||||
#define HAVE_ATOMICS_NATIVE 1
|
||||
#define HAVE_DOS_PATHS 1
|
||||
#define HAVE_DXVA2API_COBJ 1
|
||||
#define HAVE_DXVA2_LIB 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_DXVA2API_COBJ 1
|
||||
#define HAVE_LIBC_MSVCRT 1
|
||||
#define HAVE_LIBDC1394_1 0
|
||||
#define HAVE_LIBDC1394_2 0
|
||||
@ -377,6 +378,7 @@
|
||||
#define HAVE_THREADS 1
|
||||
#define HAVE_VAAPI_X11 0
|
||||
#define HAVE_VDPAU_X11 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_XLIB 0
|
||||
#define CONFIG_BSFS 0
|
||||
#define CONFIG_DECODERS 1
|
||||
@ -421,7 +423,6 @@
|
||||
#define CONFIG_GNUTLS 0
|
||||
#define CONFIG_ICONV 0
|
||||
#define CONFIG_LADSPA 0
|
||||
#define CONFIG_LIBAACPLUS 0
|
||||
#define CONFIG_LIBASS 0
|
||||
#define CONFIG_LIBBLURAY 0
|
||||
#define CONFIG_LIBBS2B 0
|
||||
@ -452,7 +453,6 @@
|
||||
#define CONFIG_LIBOPENJPEG 0
|
||||
#define CONFIG_LIBOPUS 0
|
||||
#define CONFIG_LIBPULSE 0
|
||||
#define CONFIG_LIBQUVI 0
|
||||
#define CONFIG_LIBRTMP 0
|
||||
#define CONFIG_LIBRUBBERBAND 0
|
||||
#define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -468,7 +468,6 @@
|
||||
#define CONFIG_LIBUTVIDEO 0
|
||||
#define CONFIG_LIBV4L2 0
|
||||
#define CONFIG_LIBVIDSTAB 0
|
||||
#define CONFIG_LIBVO_AACENC 0
|
||||
#define CONFIG_LIBVO_AMRWBENC 0
|
||||
#define CONFIG_LIBVORBIS 0
|
||||
#define CONFIG_LIBVPX 0
|
||||
@ -588,8 +587,8 @@
|
||||
#define CONFIG_INTRAX8 0
|
||||
#define CONFIG_IVIDSP 0
|
||||
#define CONFIG_JPEGTABLES 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LGPLV3 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LLAUDDSP 0
|
||||
#define CONFIG_LLVIDDSP 0
|
||||
#define CONFIG_LPC 0
|
||||
@ -664,6 +663,7 @@
|
||||
#define CONFIG_CAVS_DECODER 0
|
||||
#define CONFIG_CDGRAPHICS_DECODER 0
|
||||
#define CONFIG_CDXL_DECODER 0
|
||||
#define CONFIG_CFHD_DECODER 0
|
||||
#define CONFIG_CINEPAK_DECODER 0
|
||||
#define CONFIG_CLJR_DECODER 0
|
||||
#define CONFIG_CLLC_DECODER 0
|
||||
@ -677,6 +677,7 @@
|
||||
#define CONFIG_DNXHD_DECODER 0
|
||||
#define CONFIG_DPX_DECODER 0
|
||||
#define CONFIG_DSICINVIDEO_DECODER 0
|
||||
#define CONFIG_DVAUDIO_DECODER 0
|
||||
#define CONFIG_DVVIDEO_DECODER 0
|
||||
#define CONFIG_DXA_DECODER 0
|
||||
#define CONFIG_DXTORY_DECODER 0
|
||||
@ -746,6 +747,7 @@
|
||||
#define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
#define CONFIG_MPEG4_DECODER 0
|
||||
#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
#define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
#define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
#define CONFIG_MPEGVIDEO_DECODER 0
|
||||
#define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1322,7 +1324,6 @@
|
||||
#define CONFIG_LIBGME_DEMUXER 0
|
||||
#define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
#define CONFIG_LIBNUT_DEMUXER 0
|
||||
#define CONFIG_LIBQUVI_DEMUXER 0
|
||||
#define CONFIG_A64MULTI_ENCODER 0
|
||||
#define CONFIG_A64MULTI5_ENCODER 0
|
||||
#define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1390,6 +1391,7 @@
|
||||
#define CONFIG_V308_ENCODER 0
|
||||
#define CONFIG_V408_ENCODER 0
|
||||
#define CONFIG_V410_ENCODER 0
|
||||
#define CONFIG_VC2_ENCODER 0
|
||||
#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
#define CONFIG_WMV1_ENCODER 0
|
||||
#define CONFIG_WMV2_ENCODER 0
|
||||
@ -1479,7 +1481,6 @@
|
||||
#define CONFIG_LIBTHEORA_ENCODER 0
|
||||
#define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
#define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
#define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
#define CONFIG_LIBVORBIS_ENCODER 0
|
||||
#define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1493,7 +1494,6 @@
|
||||
#define CONFIG_LIBX265_ENCODER 0
|
||||
#define CONFIG_LIBXAVS_ENCODER 0
|
||||
#define CONFIG_LIBXVID_ENCODER 0
|
||||
#define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
#define CONFIG_LIBOPENH264_ENCODER 0
|
||||
#define CONFIG_H264_QSV_ENCODER 0
|
||||
#define CONFIG_NVENC_ENCODER 0
|
||||
@ -1509,12 +1509,14 @@
|
||||
#define CONFIG_AEMPHASIS_FILTER 0
|
||||
#define CONFIG_AEVAL_FILTER 0
|
||||
#define CONFIG_AFADE_FILTER 0
|
||||
#define CONFIG_AFFTFILT_FILTER 0
|
||||
#define CONFIG_AFORMAT_FILTER 0
|
||||
#define CONFIG_AGATE_FILTER 0
|
||||
#define CONFIG_AINTERLEAVE_FILTER 0
|
||||
#define CONFIG_ALIMITER_FILTER 0
|
||||
#define CONFIG_ALLPASS_FILTER 0
|
||||
#define CONFIG_AMERGE_FILTER 0
|
||||
#define CONFIG_AMETADATA_FILTER 0
|
||||
#define CONFIG_AMIX_FILTER 0
|
||||
#define CONFIG_ANEQUALIZER_FILTER 0
|
||||
#define CONFIG_ANULL_FILTER 0
|
||||
@ -1534,6 +1536,7 @@
|
||||
#define CONFIG_ASHOWINFO_FILTER 0
|
||||
#define CONFIG_ASPLIT_FILTER 0
|
||||
#define CONFIG_ASTATS_FILTER 0
|
||||
#define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
#define CONFIG_ASYNCTS_FILTER 0
|
||||
#define CONFIG_ATEMPO_FILTER 0
|
||||
#define CONFIG_ATRIM_FILTER 0
|
||||
@ -1597,6 +1600,7 @@
|
||||
#define CONFIG_COLORKEY_FILTER 0
|
||||
#define CONFIG_COLORLEVELS_FILTER 0
|
||||
#define CONFIG_COLORMATRIX_FILTER 0
|
||||
#define CONFIG_CONVOLUTION_FILTER 0
|
||||
#define CONFIG_COPY_FILTER 0
|
||||
#define CONFIG_COVER_RECT_FILTER 0
|
||||
#define CONFIG_CROP_FILTER 0
|
||||
@ -1658,8 +1662,10 @@
|
||||
#define CONFIG_MASKEDMERGE_FILTER 0
|
||||
#define CONFIG_MCDEINT_FILTER 0
|
||||
#define CONFIG_MERGEPLANES_FILTER 0
|
||||
#define CONFIG_METADATA_FILTER 0
|
||||
#define CONFIG_MPDECIMATE_FILTER 0
|
||||
#define CONFIG_NEGATE_FILTER 0
|
||||
#define CONFIG_NNEDI_FILTER 0
|
||||
#define CONFIG_NOFORMAT_FILTER 0
|
||||
#define CONFIG_NOISE_FILTER 0
|
||||
#define CONFIG_NULL_FILTER 0
|
||||
@ -1708,8 +1714,10 @@
|
||||
#define CONFIG_SPP_FILTER 0
|
||||
#define CONFIG_SSIM_FILTER 0
|
||||
#define CONFIG_STEREO3D_FILTER 0
|
||||
#define CONFIG_STREAMSELECT_FILTER 0
|
||||
#define CONFIG_SUBTITLES_FILTER 0
|
||||
#define CONFIG_SUPER2XSAI_FILTER 0
|
||||
#define CONFIG_SWAPRECT_FILTER 0
|
||||
#define CONFIG_SWAPUV_FILTER 0
|
||||
#define CONFIG_TBLEND_FILTER 0
|
||||
#define CONFIG_TELECINE_FILTER 0
|
||||
@ -1750,6 +1758,7 @@
|
||||
#define CONFIG_TESTSRC2_FILTER 0
|
||||
#define CONFIG_NULLSINK_FILTER 0
|
||||
#define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
#define CONFIG_AHISTOGRAM_FILTER 0
|
||||
#define CONFIG_APHASEMETER_FILTER 0
|
||||
#define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
#define CONFIG_CONCAT_FILTER 0
|
||||
@ -1760,6 +1769,7 @@
|
||||
#define CONFIG_SHOWVOLUME_FILTER 0
|
||||
#define CONFIG_SHOWWAVES_FILTER 0
|
||||
#define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
#define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
#define CONFIG_AMOVIE_FILTER 0
|
||||
#define CONFIG_MOVIE_FILTER 0
|
||||
#define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1789,6 +1799,7 @@
|
||||
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
#define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1994,6 +2005,7 @@
|
||||
#define CONFIG_DIRAC_PARSER 0
|
||||
#define CONFIG_DNXHD_PARSER 0
|
||||
#define CONFIG_DPX_PARSER 0
|
||||
#define CONFIG_DVAUDIO_PARSER 0
|
||||
#define CONFIG_DVBSUB_PARSER 0
|
||||
#define CONFIG_DVDSUB_PARSER 0
|
||||
#define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -201,6 +201,7 @@
|
||||
%define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
%define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
%define HAVE_MALLOC_H 1
|
||||
%define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
%define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
%define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -234,6 +235,7 @@
|
||||
%define HAVE_EXP2F 1
|
||||
%define HAVE_EXPF 1
|
||||
%define HAVE_HYPOT 1
|
||||
%define HAVE_ISFINITE 1
|
||||
%define HAVE_ISINF 1
|
||||
%define HAVE_ISNAN 1
|
||||
%define HAVE_LDEXPF 1
|
||||
@ -319,9 +321,9 @@
|
||||
%define HAVE_GNU_AS 0
|
||||
%define HAVE_GNU_WINDRES 0
|
||||
%define HAVE_IBM_ASM 0
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
%define HAVE_INLINE_ASM_LABELS 0
|
||||
%define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
|
||||
%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
%define HAVE_PRAGMA_DEPRECATED 1
|
||||
%define HAVE_RSYNC_CONTIMEOUT 0
|
||||
%define HAVE_SYMVER_ASM_LABEL 0
|
||||
@ -345,9 +347,8 @@
|
||||
%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
|
||||
%define HAVE_ATOMICS_NATIVE 1
|
||||
%define HAVE_DOS_PATHS 1
|
||||
%define HAVE_DXVA2API_COBJ 1
|
||||
%define HAVE_DXVA2_LIB 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_DXVA2API_COBJ 1
|
||||
%define HAVE_LIBC_MSVCRT 1
|
||||
%define HAVE_LIBDC1394_1 0
|
||||
%define HAVE_LIBDC1394_2 0
|
||||
@ -361,6 +362,7 @@
|
||||
%define HAVE_THREADS 1
|
||||
%define HAVE_VAAPI_X11 0
|
||||
%define HAVE_VDPAU_X11 0
|
||||
%define HAVE_WINRT 0
|
||||
%define HAVE_XLIB 0
|
||||
%define CONFIG_BSFS 0
|
||||
%define CONFIG_DECODERS 1
|
||||
@ -405,7 +407,6 @@
|
||||
%define CONFIG_GNUTLS 0
|
||||
%define CONFIG_ICONV 0
|
||||
%define CONFIG_LADSPA 0
|
||||
%define CONFIG_LIBAACPLUS 0
|
||||
%define CONFIG_LIBASS 0
|
||||
%define CONFIG_LIBBLURAY 0
|
||||
%define CONFIG_LIBBS2B 0
|
||||
@ -436,7 +437,6 @@
|
||||
%define CONFIG_LIBOPENJPEG 0
|
||||
%define CONFIG_LIBOPUS 0
|
||||
%define CONFIG_LIBPULSE 0
|
||||
%define CONFIG_LIBQUVI 0
|
||||
%define CONFIG_LIBRTMP 0
|
||||
%define CONFIG_LIBRUBBERBAND 0
|
||||
%define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -452,7 +452,6 @@
|
||||
%define CONFIG_LIBUTVIDEO 0
|
||||
%define CONFIG_LIBV4L2 0
|
||||
%define CONFIG_LIBVIDSTAB 0
|
||||
%define CONFIG_LIBVO_AACENC 0
|
||||
%define CONFIG_LIBVO_AMRWBENC 0
|
||||
%define CONFIG_LIBVORBIS 0
|
||||
%define CONFIG_LIBVPX 0
|
||||
@ -572,8 +571,8 @@
|
||||
%define CONFIG_INTRAX8 0
|
||||
%define CONFIG_IVIDSP 0
|
||||
%define CONFIG_JPEGTABLES 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LGPLV3 0
|
||||
%define CONFIG_LIBX262 0
|
||||
%define CONFIG_LLAUDDSP 0
|
||||
%define CONFIG_LLVIDDSP 0
|
||||
%define CONFIG_LPC 0
|
||||
@ -648,6 +647,7 @@
|
||||
%define CONFIG_CAVS_DECODER 0
|
||||
%define CONFIG_CDGRAPHICS_DECODER 0
|
||||
%define CONFIG_CDXL_DECODER 0
|
||||
%define CONFIG_CFHD_DECODER 0
|
||||
%define CONFIG_CINEPAK_DECODER 0
|
||||
%define CONFIG_CLJR_DECODER 0
|
||||
%define CONFIG_CLLC_DECODER 0
|
||||
@ -661,6 +661,7 @@
|
||||
%define CONFIG_DNXHD_DECODER 0
|
||||
%define CONFIG_DPX_DECODER 0
|
||||
%define CONFIG_DSICINVIDEO_DECODER 0
|
||||
%define CONFIG_DVAUDIO_DECODER 0
|
||||
%define CONFIG_DVVIDEO_DECODER 0
|
||||
%define CONFIG_DXA_DECODER 0
|
||||
%define CONFIG_DXTORY_DECODER 0
|
||||
@ -730,6 +731,7 @@
|
||||
%define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
%define CONFIG_MPEG4_DECODER 0
|
||||
%define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
%define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
%define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
%define CONFIG_MPEGVIDEO_DECODER 0
|
||||
%define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1306,7 +1308,6 @@
|
||||
%define CONFIG_LIBGME_DEMUXER 0
|
||||
%define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
%define CONFIG_LIBNUT_DEMUXER 0
|
||||
%define CONFIG_LIBQUVI_DEMUXER 0
|
||||
%define CONFIG_A64MULTI_ENCODER 0
|
||||
%define CONFIG_A64MULTI5_ENCODER 0
|
||||
%define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1374,6 +1375,7 @@
|
||||
%define CONFIG_V308_ENCODER 0
|
||||
%define CONFIG_V408_ENCODER 0
|
||||
%define CONFIG_V410_ENCODER 0
|
||||
%define CONFIG_VC2_ENCODER 0
|
||||
%define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
%define CONFIG_WMV1_ENCODER 0
|
||||
%define CONFIG_WMV2_ENCODER 0
|
||||
@ -1463,7 +1465,6 @@
|
||||
%define CONFIG_LIBTHEORA_ENCODER 0
|
||||
%define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
%define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
%define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
%define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
%define CONFIG_LIBVORBIS_ENCODER 0
|
||||
%define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1477,7 +1478,6 @@
|
||||
%define CONFIG_LIBX265_ENCODER 0
|
||||
%define CONFIG_LIBXAVS_ENCODER 0
|
||||
%define CONFIG_LIBXVID_ENCODER 0
|
||||
%define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
%define CONFIG_LIBOPENH264_ENCODER 0
|
||||
%define CONFIG_H264_QSV_ENCODER 0
|
||||
%define CONFIG_NVENC_ENCODER 0
|
||||
@ -1493,12 +1493,14 @@
|
||||
%define CONFIG_AEMPHASIS_FILTER 0
|
||||
%define CONFIG_AEVAL_FILTER 0
|
||||
%define CONFIG_AFADE_FILTER 0
|
||||
%define CONFIG_AFFTFILT_FILTER 0
|
||||
%define CONFIG_AFORMAT_FILTER 0
|
||||
%define CONFIG_AGATE_FILTER 0
|
||||
%define CONFIG_AINTERLEAVE_FILTER 0
|
||||
%define CONFIG_ALIMITER_FILTER 0
|
||||
%define CONFIG_ALLPASS_FILTER 0
|
||||
%define CONFIG_AMERGE_FILTER 0
|
||||
%define CONFIG_AMETADATA_FILTER 0
|
||||
%define CONFIG_AMIX_FILTER 0
|
||||
%define CONFIG_ANEQUALIZER_FILTER 0
|
||||
%define CONFIG_ANULL_FILTER 0
|
||||
@ -1518,6 +1520,7 @@
|
||||
%define CONFIG_ASHOWINFO_FILTER 0
|
||||
%define CONFIG_ASPLIT_FILTER 0
|
||||
%define CONFIG_ASTATS_FILTER 0
|
||||
%define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
%define CONFIG_ASYNCTS_FILTER 0
|
||||
%define CONFIG_ATEMPO_FILTER 0
|
||||
%define CONFIG_ATRIM_FILTER 0
|
||||
@ -1581,6 +1584,7 @@
|
||||
%define CONFIG_COLORKEY_FILTER 0
|
||||
%define CONFIG_COLORLEVELS_FILTER 0
|
||||
%define CONFIG_COLORMATRIX_FILTER 0
|
||||
%define CONFIG_CONVOLUTION_FILTER 0
|
||||
%define CONFIG_COPY_FILTER 0
|
||||
%define CONFIG_COVER_RECT_FILTER 0
|
||||
%define CONFIG_CROP_FILTER 0
|
||||
@ -1642,8 +1646,10 @@
|
||||
%define CONFIG_MASKEDMERGE_FILTER 0
|
||||
%define CONFIG_MCDEINT_FILTER 0
|
||||
%define CONFIG_MERGEPLANES_FILTER 0
|
||||
%define CONFIG_METADATA_FILTER 0
|
||||
%define CONFIG_MPDECIMATE_FILTER 0
|
||||
%define CONFIG_NEGATE_FILTER 0
|
||||
%define CONFIG_NNEDI_FILTER 0
|
||||
%define CONFIG_NOFORMAT_FILTER 0
|
||||
%define CONFIG_NOISE_FILTER 0
|
||||
%define CONFIG_NULL_FILTER 0
|
||||
@ -1692,8 +1698,10 @@
|
||||
%define CONFIG_SPP_FILTER 0
|
||||
%define CONFIG_SSIM_FILTER 0
|
||||
%define CONFIG_STEREO3D_FILTER 0
|
||||
%define CONFIG_STREAMSELECT_FILTER 0
|
||||
%define CONFIG_SUBTITLES_FILTER 0
|
||||
%define CONFIG_SUPER2XSAI_FILTER 0
|
||||
%define CONFIG_SWAPRECT_FILTER 0
|
||||
%define CONFIG_SWAPUV_FILTER 0
|
||||
%define CONFIG_TBLEND_FILTER 0
|
||||
%define CONFIG_TELECINE_FILTER 0
|
||||
@ -1734,6 +1742,7 @@
|
||||
%define CONFIG_TESTSRC2_FILTER 0
|
||||
%define CONFIG_NULLSINK_FILTER 0
|
||||
%define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
%define CONFIG_AHISTOGRAM_FILTER 0
|
||||
%define CONFIG_APHASEMETER_FILTER 0
|
||||
%define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
%define CONFIG_CONCAT_FILTER 0
|
||||
@ -1744,6 +1753,7 @@
|
||||
%define CONFIG_SHOWVOLUME_FILTER 0
|
||||
%define CONFIG_SHOWWAVES_FILTER 0
|
||||
%define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
%define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
%define CONFIG_AMOVIE_FILTER 0
|
||||
%define CONFIG_MOVIE_FILTER 0
|
||||
%define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1773,6 +1783,7 @@
|
||||
%define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
%define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1978,6 +1989,7 @@
|
||||
%define CONFIG_DIRAC_PARSER 0
|
||||
%define CONFIG_DNXHD_PARSER 0
|
||||
%define CONFIG_DPX_PARSER 0
|
||||
%define CONFIG_DVAUDIO_PARSER 0
|
||||
%define CONFIG_DVBSUB_PARSER 0
|
||||
%define CONFIG_DVDSUB_PARSER 0
|
||||
%define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -217,6 +217,7 @@
|
||||
#define HAVE_MACHINE_IOCTL_BT848_H 0
|
||||
#define HAVE_MACHINE_IOCTL_METEOR_H 0
|
||||
#define HAVE_MALLOC_H 1
|
||||
#define HAVE_OPENCV2_CORE_CORE_C_H 0
|
||||
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
|
||||
#define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
|
||||
@ -250,6 +251,7 @@
|
||||
#define HAVE_EXP2F 1
|
||||
#define HAVE_EXPF 1
|
||||
#define HAVE_HYPOT 1
|
||||
#define HAVE_ISFINITE 1
|
||||
#define HAVE_ISINF 1
|
||||
#define HAVE_ISNAN 1
|
||||
#define HAVE_LDEXPF 1
|
||||
@ -335,9 +337,9 @@
|
||||
#define HAVE_GNU_AS 0
|
||||
#define HAVE_GNU_WINDRES 0
|
||||
#define HAVE_IBM_ASM 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
#define HAVE_INLINE_ASM_LABELS 0
|
||||
#define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
|
||||
#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
|
||||
#define HAVE_PRAGMA_DEPRECATED 1
|
||||
#define HAVE_RSYNC_CONTIMEOUT 0
|
||||
#define HAVE_SYMVER_ASM_LABEL 0
|
||||
@ -361,9 +363,8 @@
|
||||
#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
|
||||
#define HAVE_ATOMICS_NATIVE 1
|
||||
#define HAVE_DOS_PATHS 1
|
||||
#define HAVE_DXVA2API_COBJ 1
|
||||
#define HAVE_DXVA2_LIB 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_DXVA2API_COBJ 1
|
||||
#define HAVE_LIBC_MSVCRT 1
|
||||
#define HAVE_LIBDC1394_1 0
|
||||
#define HAVE_LIBDC1394_2 0
|
||||
@ -377,6 +378,7 @@
|
||||
#define HAVE_THREADS 1
|
||||
#define HAVE_VAAPI_X11 0
|
||||
#define HAVE_VDPAU_X11 0
|
||||
#define HAVE_WINRT 0
|
||||
#define HAVE_XLIB 0
|
||||
#define CONFIG_BSFS 0
|
||||
#define CONFIG_DECODERS 1
|
||||
@ -421,7 +423,6 @@
|
||||
#define CONFIG_GNUTLS 0
|
||||
#define CONFIG_ICONV 0
|
||||
#define CONFIG_LADSPA 0
|
||||
#define CONFIG_LIBAACPLUS 0
|
||||
#define CONFIG_LIBASS 0
|
||||
#define CONFIG_LIBBLURAY 0
|
||||
#define CONFIG_LIBBS2B 0
|
||||
@ -452,7 +453,6 @@
|
||||
#define CONFIG_LIBOPENJPEG 0
|
||||
#define CONFIG_LIBOPUS 0
|
||||
#define CONFIG_LIBPULSE 0
|
||||
#define CONFIG_LIBQUVI 0
|
||||
#define CONFIG_LIBRTMP 0
|
||||
#define CONFIG_LIBRUBBERBAND 0
|
||||
#define CONFIG_LIBSCHROEDINGER 0
|
||||
@ -468,7 +468,6 @@
|
||||
#define CONFIG_LIBUTVIDEO 0
|
||||
#define CONFIG_LIBV4L2 0
|
||||
#define CONFIG_LIBVIDSTAB 0
|
||||
#define CONFIG_LIBVO_AACENC 0
|
||||
#define CONFIG_LIBVO_AMRWBENC 0
|
||||
#define CONFIG_LIBVORBIS 0
|
||||
#define CONFIG_LIBVPX 0
|
||||
@ -588,8 +587,8 @@
|
||||
#define CONFIG_INTRAX8 0
|
||||
#define CONFIG_IVIDSP 0
|
||||
#define CONFIG_JPEGTABLES 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LGPLV3 0
|
||||
#define CONFIG_LIBX262 0
|
||||
#define CONFIG_LLAUDDSP 0
|
||||
#define CONFIG_LLVIDDSP 0
|
||||
#define CONFIG_LPC 0
|
||||
@ -664,6 +663,7 @@
|
||||
#define CONFIG_CAVS_DECODER 0
|
||||
#define CONFIG_CDGRAPHICS_DECODER 0
|
||||
#define CONFIG_CDXL_DECODER 0
|
||||
#define CONFIG_CFHD_DECODER 0
|
||||
#define CONFIG_CINEPAK_DECODER 0
|
||||
#define CONFIG_CLJR_DECODER 0
|
||||
#define CONFIG_CLLC_DECODER 0
|
||||
@ -677,6 +677,7 @@
|
||||
#define CONFIG_DNXHD_DECODER 0
|
||||
#define CONFIG_DPX_DECODER 0
|
||||
#define CONFIG_DSICINVIDEO_DECODER 0
|
||||
#define CONFIG_DVAUDIO_DECODER 0
|
||||
#define CONFIG_DVVIDEO_DECODER 0
|
||||
#define CONFIG_DXA_DECODER 0
|
||||
#define CONFIG_DXTORY_DECODER 0
|
||||
@ -746,6 +747,7 @@
|
||||
#define CONFIG_MPEG2VIDEO_DECODER 0
|
||||
#define CONFIG_MPEG4_DECODER 0
|
||||
#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
|
||||
#define CONFIG_MPEG4_MMAL_DECODER 0
|
||||
#define CONFIG_MPEG4_VDPAU_DECODER 0
|
||||
#define CONFIG_MPEGVIDEO_DECODER 0
|
||||
#define CONFIG_MPEG_VDPAU_DECODER 0
|
||||
@ -1322,7 +1324,6 @@
|
||||
#define CONFIG_LIBGME_DEMUXER 0
|
||||
#define CONFIG_LIBMODPLUG_DEMUXER 0
|
||||
#define CONFIG_LIBNUT_DEMUXER 0
|
||||
#define CONFIG_LIBQUVI_DEMUXER 0
|
||||
#define CONFIG_A64MULTI_ENCODER 0
|
||||
#define CONFIG_A64MULTI5_ENCODER 0
|
||||
#define CONFIG_ALIAS_PIX_ENCODER 0
|
||||
@ -1390,6 +1391,7 @@
|
||||
#define CONFIG_V308_ENCODER 0
|
||||
#define CONFIG_V408_ENCODER 0
|
||||
#define CONFIG_V410_ENCODER 0
|
||||
#define CONFIG_VC2_ENCODER 0
|
||||
#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
|
||||
#define CONFIG_WMV1_ENCODER 0
|
||||
#define CONFIG_WMV2_ENCODER 0
|
||||
@ -1479,7 +1481,6 @@
|
||||
#define CONFIG_LIBTHEORA_ENCODER 0
|
||||
#define CONFIG_LIBTWOLAME_ENCODER 0
|
||||
#define CONFIG_LIBUTVIDEO_ENCODER 0
|
||||
#define CONFIG_LIBVO_AACENC_ENCODER 0
|
||||
#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
|
||||
#define CONFIG_LIBVORBIS_ENCODER 0
|
||||
#define CONFIG_LIBVPX_VP8_ENCODER 0
|
||||
@ -1493,7 +1494,6 @@
|
||||
#define CONFIG_LIBX265_ENCODER 0
|
||||
#define CONFIG_LIBXAVS_ENCODER 0
|
||||
#define CONFIG_LIBXVID_ENCODER 0
|
||||
#define CONFIG_LIBAACPLUS_ENCODER 0
|
||||
#define CONFIG_LIBOPENH264_ENCODER 0
|
||||
#define CONFIG_H264_QSV_ENCODER 0
|
||||
#define CONFIG_NVENC_ENCODER 0
|
||||
@ -1509,12 +1509,14 @@
|
||||
#define CONFIG_AEMPHASIS_FILTER 0
|
||||
#define CONFIG_AEVAL_FILTER 0
|
||||
#define CONFIG_AFADE_FILTER 0
|
||||
#define CONFIG_AFFTFILT_FILTER 0
|
||||
#define CONFIG_AFORMAT_FILTER 0
|
||||
#define CONFIG_AGATE_FILTER 0
|
||||
#define CONFIG_AINTERLEAVE_FILTER 0
|
||||
#define CONFIG_ALIMITER_FILTER 0
|
||||
#define CONFIG_ALLPASS_FILTER 0
|
||||
#define CONFIG_AMERGE_FILTER 0
|
||||
#define CONFIG_AMETADATA_FILTER 0
|
||||
#define CONFIG_AMIX_FILTER 0
|
||||
#define CONFIG_ANEQUALIZER_FILTER 0
|
||||
#define CONFIG_ANULL_FILTER 0
|
||||
@ -1534,6 +1536,7 @@
|
||||
#define CONFIG_ASHOWINFO_FILTER 0
|
||||
#define CONFIG_ASPLIT_FILTER 0
|
||||
#define CONFIG_ASTATS_FILTER 0
|
||||
#define CONFIG_ASTREAMSELECT_FILTER 0
|
||||
#define CONFIG_ASYNCTS_FILTER 0
|
||||
#define CONFIG_ATEMPO_FILTER 0
|
||||
#define CONFIG_ATRIM_FILTER 0
|
||||
@ -1597,6 +1600,7 @@
|
||||
#define CONFIG_COLORKEY_FILTER 0
|
||||
#define CONFIG_COLORLEVELS_FILTER 0
|
||||
#define CONFIG_COLORMATRIX_FILTER 0
|
||||
#define CONFIG_CONVOLUTION_FILTER 0
|
||||
#define CONFIG_COPY_FILTER 0
|
||||
#define CONFIG_COVER_RECT_FILTER 0
|
||||
#define CONFIG_CROP_FILTER 0
|
||||
@ -1658,8 +1662,10 @@
|
||||
#define CONFIG_MASKEDMERGE_FILTER 0
|
||||
#define CONFIG_MCDEINT_FILTER 0
|
||||
#define CONFIG_MERGEPLANES_FILTER 0
|
||||
#define CONFIG_METADATA_FILTER 0
|
||||
#define CONFIG_MPDECIMATE_FILTER 0
|
||||
#define CONFIG_NEGATE_FILTER 0
|
||||
#define CONFIG_NNEDI_FILTER 0
|
||||
#define CONFIG_NOFORMAT_FILTER 0
|
||||
#define CONFIG_NOISE_FILTER 0
|
||||
#define CONFIG_NULL_FILTER 0
|
||||
@ -1708,8 +1714,10 @@
|
||||
#define CONFIG_SPP_FILTER 0
|
||||
#define CONFIG_SSIM_FILTER 0
|
||||
#define CONFIG_STEREO3D_FILTER 0
|
||||
#define CONFIG_STREAMSELECT_FILTER 0
|
||||
#define CONFIG_SUBTITLES_FILTER 0
|
||||
#define CONFIG_SUPER2XSAI_FILTER 0
|
||||
#define CONFIG_SWAPRECT_FILTER 0
|
||||
#define CONFIG_SWAPUV_FILTER 0
|
||||
#define CONFIG_TBLEND_FILTER 0
|
||||
#define CONFIG_TELECINE_FILTER 0
|
||||
@ -1750,6 +1758,7 @@
|
||||
#define CONFIG_TESTSRC2_FILTER 0
|
||||
#define CONFIG_NULLSINK_FILTER 0
|
||||
#define CONFIG_ADRAWGRAPH_FILTER 0
|
||||
#define CONFIG_AHISTOGRAM_FILTER 0
|
||||
#define CONFIG_APHASEMETER_FILTER 0
|
||||
#define CONFIG_AVECTORSCOPE_FILTER 0
|
||||
#define CONFIG_CONCAT_FILTER 0
|
||||
@ -1760,6 +1769,7 @@
|
||||
#define CONFIG_SHOWVOLUME_FILTER 0
|
||||
#define CONFIG_SHOWWAVES_FILTER 0
|
||||
#define CONFIG_SHOWWAVESPIC_FILTER 0
|
||||
#define CONFIG_SPECTRUMSYNTH_FILTER 0
|
||||
#define CONFIG_AMOVIE_FILTER 0
|
||||
#define CONFIG_MOVIE_FILTER 0
|
||||
#define CONFIG_H263_VAAPI_HWACCEL 0
|
||||
@ -1789,6 +1799,7 @@
|
||||
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
|
||||
#define CONFIG_MPEG4_MMAL_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
|
||||
#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
|
||||
@ -1994,6 +2005,7 @@
|
||||
#define CONFIG_DIRAC_PARSER 0
|
||||
#define CONFIG_DNXHD_PARSER 0
|
||||
#define CONFIG_DPX_PARSER 0
|
||||
#define CONFIG_DVAUDIO_PARSER 0
|
||||
#define CONFIG_DVBSUB_PARSER 0
|
||||
#define CONFIG_DVDSUB_PARSER 0
|
||||
#define CONFIG_DVD_NAV_PARSER 0
|
||||
|
||||
@ -101,6 +101,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi);
|
||||
REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau);
|
||||
REGISTER_HWACCEL(MPEG2_VIDEOTOOLBOX, mpeg2_videotoolbox);
|
||||
REGISTER_HWACCEL(MPEG4_MMAL, mpeg4_mmal);
|
||||
REGISTER_HWACCEL(MPEG4_VAAPI, mpeg4_vaapi);
|
||||
REGISTER_HWACCEL(MPEG4_VDPAU, mpeg4_vdpau);
|
||||
REGISTER_HWACCEL(MPEG4_VIDEOTOOLBOX, mpeg4_videotoolbox);
|
||||
@ -147,6 +148,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_DECODER(CAVS, cavs);
|
||||
REGISTER_DECODER(CDGRAPHICS, cdgraphics);
|
||||
REGISTER_DECODER(CDXL, cdxl);
|
||||
REGISTER_DECODER(CFHD, cfhd);
|
||||
REGISTER_ENCDEC (CINEPAK, cinepak);
|
||||
REGISTER_ENCDEC (CLJR, cljr);
|
||||
REGISTER_DECODER(CLLC, cllc);
|
||||
@ -160,6 +162,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_ENCDEC (DNXHD, dnxhd);
|
||||
REGISTER_ENCDEC (DPX, dpx);
|
||||
REGISTER_DECODER(DSICINVIDEO, dsicinvideo);
|
||||
REGISTER_DECODER(DVAUDIO, dvaudio);
|
||||
REGISTER_ENCDEC (DVVIDEO, dvvideo);
|
||||
REGISTER_DECODER(DXA, dxa);
|
||||
REGISTER_DECODER(DXTORY, dxtory);
|
||||
@ -234,6 +237,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
|
||||
REGISTER_ENCDEC (MPEG4, mpeg4);
|
||||
REGISTER_DECODER(MPEG4_CRYSTALHD, mpeg4_crystalhd);
|
||||
REGISTER_DECODER(MPEG4_MMAL, mpeg4_mmal);
|
||||
#if FF_API_VDPAU
|
||||
REGISTER_DECODER(MPEG4_VDPAU, mpeg4_vdpau);
|
||||
#endif
|
||||
@ -332,6 +336,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_DECODER(VC1IMAGE, vc1image);
|
||||
REGISTER_DECODER(VC1_MMAL, vc1_mmal);
|
||||
REGISTER_DECODER(VC1_QSV, vc1_qsv);
|
||||
REGISTER_ENCODER(VC2, vc2);
|
||||
REGISTER_DECODER(VCR1, vcr1);
|
||||
REGISTER_DECODER(VMDVIDEO, vmdvideo);
|
||||
REGISTER_DECODER(VMNC, vmnc);
|
||||
@ -575,7 +580,6 @@ void avcodec_register_all(void)
|
||||
REGISTER_ENCODER(LIBTHEORA, libtheora);
|
||||
REGISTER_ENCODER(LIBTWOLAME, libtwolame);
|
||||
REGISTER_ENCDEC (LIBUTVIDEO, libutvideo);
|
||||
REGISTER_ENCODER(LIBVO_AACENC, libvo_aacenc);
|
||||
REGISTER_ENCODER(LIBVO_AMRWBENC, libvo_amrwbenc);
|
||||
REGISTER_ENCDEC (LIBVORBIS, libvorbis);
|
||||
REGISTER_ENCDEC (LIBVPX_VP8, libvpx_vp8);
|
||||
@ -590,7 +594,6 @@ void avcodec_register_all(void)
|
||||
REGISTER_ENCODER(LIBXAVS, libxavs);
|
||||
REGISTER_ENCODER(LIBXVID, libxvid);
|
||||
REGISTER_DECODER(LIBZVBI_TELETEXT, libzvbi_teletext);
|
||||
REGISTER_ENCODER(LIBAACPLUS, libaacplus);
|
||||
|
||||
/* text */
|
||||
REGISTER_DECODER(BINTEXT, bintext);
|
||||
@ -620,6 +623,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_PARSER(DIRAC, dirac);
|
||||
REGISTER_PARSER(DNXHD, dnxhd);
|
||||
REGISTER_PARSER(DPX, dpx);
|
||||
REGISTER_PARSER(DVAUDIO, dvaudio);
|
||||
REGISTER_PARSER(DVBSUB, dvbsub);
|
||||
REGISTER_PARSER(DVDSUB, dvdsub);
|
||||
REGISTER_PARSER(DVD_NAV, dvd_nav);
|
||||
|
||||
@ -315,6 +315,7 @@ enum AVCodecID {
|
||||
AV_CODEC_ID_SMVJPEG,
|
||||
AV_CODEC_ID_APNG,
|
||||
AV_CODEC_ID_DAALA,
|
||||
AV_CODEC_ID_CFHD,
|
||||
|
||||
/* various PCM "codecs" */
|
||||
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
|
||||
@ -1823,7 +1824,11 @@ typedef struct AVCodecContext {
|
||||
#define FF_RC_STRATEGY_XVID 1
|
||||
#endif
|
||||
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int b_frame_strategy;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* qscale offset between IP and B-frames
|
||||
@ -1840,12 +1845,11 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int has_b_frames;
|
||||
|
||||
/**
|
||||
* 0-> h263 quant 1-> mpeg quant
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int mpeg_quant;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* qscale factor between P and I-frames
|
||||
@ -1904,15 +1908,15 @@ typedef struct AVCodecContext {
|
||||
* - decoding: Set by user (or 0).
|
||||
*/
|
||||
int slice_count;
|
||||
/**
|
||||
* prediction method (needed for huffyuv)
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int prediction_method;
|
||||
#define FF_PRED_LEFT 0
|
||||
#define FF_PRED_PLANE 1
|
||||
#define FF_PRED_MEDIAN 2
|
||||
#endif
|
||||
|
||||
/**
|
||||
* slice offsets in the frame in bytes
|
||||
@ -1985,12 +1989,11 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int last_predictor_count;
|
||||
|
||||
/**
|
||||
* prepass for motion estimation
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int pre_me;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* motion estimation prepass comparison function
|
||||
@ -2099,20 +2102,15 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
uint16_t *inter_matrix;
|
||||
|
||||
/**
|
||||
* scene change detection threshold
|
||||
* 0 is default, larger means fewer detected scene changes.
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int scenechange_threshold;
|
||||
|
||||
/**
|
||||
* noise reduction strength
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int noise_reduction;
|
||||
#endif
|
||||
|
||||
#if FF_API_MPV_OPT
|
||||
/**
|
||||
@ -2171,12 +2169,13 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int mb_lmax;
|
||||
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/**
|
||||
*
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
* @deprecated use encoder private options instead
|
||||
*/
|
||||
attribute_deprecated
|
||||
int me_penalty_compensation;
|
||||
#endif
|
||||
|
||||
/**
|
||||
*
|
||||
@ -2185,12 +2184,11 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int bidir_refine;
|
||||
|
||||
/**
|
||||
*
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int brd_scale;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* minimum GOP size
|
||||
@ -2206,12 +2204,11 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int refs;
|
||||
|
||||
/**
|
||||
* chroma qp offset from luma
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int chromaoffset;
|
||||
#endif
|
||||
|
||||
#if FF_API_UNUSED_MEMBERS
|
||||
/**
|
||||
@ -2230,12 +2227,11 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int mv0_threshold;
|
||||
|
||||
/**
|
||||
* Adjust sensitivity of b_frame_strategy 1.
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int b_sensitivity;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Chromaticity coordinates of the source primaries.
|
||||
@ -2580,12 +2576,11 @@ typedef struct AVCodecContext {
|
||||
int coder_type;
|
||||
#endif /* FF_API_CODER_TYPE */
|
||||
|
||||
/**
|
||||
* context model
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int context_model;
|
||||
#endif
|
||||
|
||||
#if FF_API_MPV_OPT
|
||||
/**
|
||||
@ -2601,33 +2596,23 @@ typedef struct AVCodecContext {
|
||||
int lmax;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* frame skip threshold
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int frame_skip_threshold;
|
||||
|
||||
/**
|
||||
* frame skip factor
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int frame_skip_factor;
|
||||
|
||||
/**
|
||||
* frame skip exponent
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int frame_skip_exp;
|
||||
|
||||
/**
|
||||
* frame skip comparison function
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int frame_skip_cmp;
|
||||
#endif /* FF_API_PRIVATE_OPT */
|
||||
|
||||
/**
|
||||
* trellis RD quantization
|
||||
@ -2636,24 +2621,19 @@ typedef struct AVCodecContext {
|
||||
*/
|
||||
int trellis;
|
||||
|
||||
/**
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int min_prediction_order;
|
||||
|
||||
/**
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int max_prediction_order;
|
||||
|
||||
/**
|
||||
* GOP timecode frame start number
|
||||
* - encoding: Set by user, in non drop frame format
|
||||
* - decoding: Set by libavcodec (timecode in the 25 bits format, -1 if unset)
|
||||
*/
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int64_t timecode_frame_start;
|
||||
#endif
|
||||
|
||||
#if FF_API_RTP_CALLBACK
|
||||
/**
|
||||
@ -2669,12 +2649,16 @@ typedef struct AVCodecContext {
|
||||
void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
|
||||
#endif
|
||||
|
||||
#if FF_API_PRIVATE_OPT
|
||||
/** @deprecated use encoder private options instead */
|
||||
attribute_deprecated
|
||||
int rtp_payload_size; /* The size of the RTP payload: the coder will */
|
||||
/* do its best to deliver a chunk with size */
|
||||
/* below rtp_payload_size, the chunk will start */
|
||||
/* with a start code on some codecs like H.263. */
|
||||
/* This doesn't take account of any particular */
|
||||
/* headers inside the transmitted RTP payload. */
|
||||
#endif
|
||||
|
||||
#if FF_API_STAT_BITS
|
||||
/* statistics, used for 2-pass encoding */
|
||||
|
||||
@ -1521,6 +1521,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
||||
.props = AV_CODEC_PROP_LOSSLESS,
|
||||
.mime_types= MT("image/png"),
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_CFHD,
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.name = "cfhd",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Cineform HD"),
|
||||
.props = AV_CODEC_PROP_LOSSY,
|
||||
},
|
||||
|
||||
/* various PCM "codecs" */
|
||||
{
|
||||
@ -2446,6 +2453,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
||||
.name = "aac_latm",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"),
|
||||
.props = AV_CODEC_PROP_LOSSY,
|
||||
.profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles),
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_QDMC,
|
||||
|
||||
@ -38,6 +38,7 @@ AVHWAccel ff_mpeg2_qsv_hwaccel;
|
||||
AVHWAccel ff_mpeg2_vaapi_hwaccel;
|
||||
AVHWAccel ff_mpeg2_vdpau_hwaccel;
|
||||
AVHWAccel ff_mpeg2_videotoolbox_hwaccel;
|
||||
AVHWAccel ff_mpeg4_mmal_hwaccel;
|
||||
AVHWAccel ff_mpeg4_vaapi_hwaccel;
|
||||
AVHWAccel ff_mpeg4_vdpau_hwaccel;
|
||||
AVHWAccel ff_mpeg4_videotoolbox_hwaccel;
|
||||
@ -92,6 +93,7 @@ AVCodec ff_c93_decoder;
|
||||
AVCodec ff_cavs_decoder;
|
||||
AVCodec ff_cdgraphics_decoder;
|
||||
AVCodec ff_cdxl_decoder;
|
||||
AVCodec ff_cfhd_decoder;
|
||||
AVCodec ff_cinepak_encoder;
|
||||
AVCodec ff_cinepak_decoder;
|
||||
AVCodec ff_cljr_encoder;
|
||||
@ -110,6 +112,7 @@ AVCodec ff_dnxhd_decoder;
|
||||
AVCodec ff_dpx_encoder;
|
||||
AVCodec ff_dpx_decoder;
|
||||
AVCodec ff_dsicinvideo_decoder;
|
||||
AVCodec ff_dvaudio_decoder;
|
||||
AVCodec ff_dvvideo_encoder;
|
||||
AVCodec ff_dvvideo_decoder;
|
||||
AVCodec ff_dxa_decoder;
|
||||
@ -198,6 +201,7 @@ AVCodec ff_mpeg2video_decoder;
|
||||
AVCodec ff_mpeg4_encoder;
|
||||
AVCodec ff_mpeg4_decoder;
|
||||
AVCodec ff_mpeg4_crystalhd_decoder;
|
||||
AVCodec ff_mpeg4_mmal_decoder;
|
||||
AVCodec ff_mpeg4_vdpau_decoder;
|
||||
AVCodec ff_mpegvideo_decoder;
|
||||
AVCodec ff_mpeg_vdpau_decoder;
|
||||
@ -315,6 +319,7 @@ AVCodec ff_vc1_crystalhd_decoder;
|
||||
AVCodec ff_vc1_vdpau_decoder;
|
||||
AVCodec ff_vc1image_decoder;
|
||||
AVCodec ff_vc1_qsv_decoder;
|
||||
AVCodec ff_vc2_encoder;
|
||||
AVCodec ff_vcr1_decoder;
|
||||
AVCodec ff_vmdvideo_decoder;
|
||||
AVCodec ff_vmnc_decoder;
|
||||
@ -672,6 +677,7 @@ AVCodecParser ff_dca_parser;
|
||||
AVCodecParser ff_dirac_parser;
|
||||
AVCodecParser ff_dnxhd_parser;
|
||||
AVCodecParser ff_dpx_parser;
|
||||
AVCodecParser ff_dvaudio_parser;
|
||||
AVCodecParser ff_dvbsub_parser;
|
||||
AVCodecParser ff_dvdsub_parser;
|
||||
AVCodecParser ff_dvd_nav_parser;
|
||||
|
||||
@ -18,9 +18,13 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_FRAME_THREAD_ENCODER_H
|
||||
#define AVCODEC_FRAME_THREAD_ENCODER_H
|
||||
|
||||
#include "avcodec.h"
|
||||
|
||||
int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options);
|
||||
void ff_frame_thread_encoder_free(AVCodecContext *avctx);
|
||||
int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet_ptr);
|
||||
|
||||
#endif /* AVCODEC_FRAME_THREAD_ENCODER_H */
|
||||
|
||||
@ -24,14 +24,7 @@
|
||||
* misc image conversion routines
|
||||
*/
|
||||
|
||||
/* TODO:
|
||||
* - write 'ffimg' program to test all the image related stuff
|
||||
* - move all api to slice based system
|
||||
* - integrate deinterlacing, postprocessing and scaling in the conversion process
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "imgconvert.h"
|
||||
#include "internal.h"
|
||||
#include "mathops.h"
|
||||
#include "libavutil/avassert.h"
|
||||
@ -41,6 +34,7 @@
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/imgutils.h"
|
||||
|
||||
#if FF_API_GETCHROMA
|
||||
void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift)
|
||||
{
|
||||
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
|
||||
@ -48,6 +42,7 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int
|
||||
*h_shift = desc->log2_chroma_w;
|
||||
*v_shift = desc->log2_chroma_h;
|
||||
}
|
||||
#endif
|
||||
|
||||
int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
|
||||
enum AVPixelFormat src_pix_fmt,
|
||||
@ -89,92 +84,8 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p
|
||||
return best;
|
||||
}
|
||||
|
||||
/* 2x2 -> 1x1 */
|
||||
void ff_shrink22(uint8_t *dst, int dst_wrap,
|
||||
const uint8_t *src, int src_wrap,
|
||||
int width, int height)
|
||||
{
|
||||
int w;
|
||||
const uint8_t *s1, *s2;
|
||||
uint8_t *d;
|
||||
|
||||
for(;height > 0; height--) {
|
||||
s1 = src;
|
||||
s2 = s1 + src_wrap;
|
||||
d = dst;
|
||||
for(w = width;w >= 4; w-=4) {
|
||||
d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 2;
|
||||
d[1] = (s1[2] + s1[3] + s2[2] + s2[3] + 2) >> 2;
|
||||
d[2] = (s1[4] + s1[5] + s2[4] + s2[5] + 2) >> 2;
|
||||
d[3] = (s1[6] + s1[7] + s2[6] + s2[7] + 2) >> 2;
|
||||
s1 += 8;
|
||||
s2 += 8;
|
||||
d += 4;
|
||||
}
|
||||
for(;w > 0; w--) {
|
||||
d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 2;
|
||||
s1 += 2;
|
||||
s2 += 2;
|
||||
d++;
|
||||
}
|
||||
src += 2 * src_wrap;
|
||||
dst += dst_wrap;
|
||||
}
|
||||
}
|
||||
|
||||
/* 4x4 -> 1x1 */
|
||||
void ff_shrink44(uint8_t *dst, int dst_wrap,
|
||||
const uint8_t *src, int src_wrap,
|
||||
int width, int height)
|
||||
{
|
||||
int w;
|
||||
const uint8_t *s1, *s2, *s3, *s4;
|
||||
uint8_t *d;
|
||||
|
||||
for(;height > 0; height--) {
|
||||
s1 = src;
|
||||
s2 = s1 + src_wrap;
|
||||
s3 = s2 + src_wrap;
|
||||
s4 = s3 + src_wrap;
|
||||
d = dst;
|
||||
for(w = width;w > 0; w--) {
|
||||
d[0] = (s1[0] + s1[1] + s1[2] + s1[3] +
|
||||
s2[0] + s2[1] + s2[2] + s2[3] +
|
||||
s3[0] + s3[1] + s3[2] + s3[3] +
|
||||
s4[0] + s4[1] + s4[2] + s4[3] + 8) >> 4;
|
||||
s1 += 4;
|
||||
s2 += 4;
|
||||
s3 += 4;
|
||||
s4 += 4;
|
||||
d++;
|
||||
}
|
||||
src += 4 * src_wrap;
|
||||
dst += dst_wrap;
|
||||
}
|
||||
}
|
||||
|
||||
/* 8x8 -> 1x1 */
|
||||
void ff_shrink88(uint8_t *dst, int dst_wrap,
|
||||
const uint8_t *src, int src_wrap,
|
||||
int width, int height)
|
||||
{
|
||||
int w, i;
|
||||
|
||||
for(;height > 0; height--) {
|
||||
for(w = width;w > 0; w--) {
|
||||
int tmp=0;
|
||||
for(i=0; i<8; i++){
|
||||
tmp += src[0] + src[1] + src[2] + src[3] + src[4] + src[5] + src[6] + src[7];
|
||||
src += src_wrap;
|
||||
}
|
||||
*(dst++) = (tmp + 32)>>6;
|
||||
src += 8 - 8*src_wrap;
|
||||
}
|
||||
src += 8*src_wrap - 8*width;
|
||||
dst += dst_wrap - width;
|
||||
}
|
||||
}
|
||||
|
||||
#if FF_API_AVPICTURE
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
/* return true if yuv planar */
|
||||
static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
|
||||
{
|
||||
@ -196,9 +107,6 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if FF_API_AVPICTURE
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
int av_picture_crop(AVPicture *dst, const AVPicture *src,
|
||||
enum AVPixelFormat pix_fmt, int top_band, int left_band)
|
||||
{
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_MOTIONEST_H
|
||||
#define AVCODEC_MOTIONEST_H
|
||||
#ifndef AVCODEC_MOTION_EST_H
|
||||
#define AVCODEC_MOTION_EST_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -29,7 +29,11 @@
|
||||
|
||||
struct MpegEncContext;
|
||||
|
||||
#if ARCH_IA64 // Limit static arrays to avoid gcc failing "short data segment overflowed"
|
||||
#define MAX_MV 1024
|
||||
#else
|
||||
#define MAX_MV 4096
|
||||
#endif
|
||||
#define MAX_DMV (2*MAX_MV)
|
||||
#define ME_MAP_SIZE 64
|
||||
|
||||
@ -128,4 +132,4 @@ void ff_fix_long_mvs(struct MpegEncContext *s, uint8_t *field_select_table,
|
||||
int field_select, int16_t (*mv_table)[2], int f_code,
|
||||
int type, int truncate);
|
||||
|
||||
#endif /* AVCODEC_MOTIONEST_H */
|
||||
#endif /* AVCODEC_MOTION_EST_H */
|
||||
|
||||
@ -256,6 +256,8 @@ typedef struct MpegEncContext {
|
||||
int me_method; ///< ME algorithm
|
||||
#endif
|
||||
int motion_est; ///< ME algorithm
|
||||
int me_penalty_compensation;
|
||||
int me_pre; ///< prepass for motion estimation
|
||||
int mv_dir;
|
||||
#define MV_DIR_FORWARD 1
|
||||
#define MV_DIR_BACKWARD 2
|
||||
@ -419,6 +421,7 @@ typedef struct MpegEncContext {
|
||||
/* MJPEG specific */
|
||||
struct MJpegContext *mjpeg_ctx;
|
||||
int esc_pos;
|
||||
int pred;
|
||||
|
||||
/* MSMPEG4 specific */
|
||||
int mv_table_index;
|
||||
@ -453,11 +456,13 @@ typedef struct MpegEncContext {
|
||||
// picture structure defines are loaded from mpegutils.h
|
||||
int picture_structure;
|
||||
|
||||
int64_t timecode_frame_start; ///< GOP timecode frame start number, in non drop frame format
|
||||
int intra_dc_precision;
|
||||
int frame_pred_frame_dct;
|
||||
int top_field_first;
|
||||
int concealment_motion_vectors;
|
||||
int q_scale_type;
|
||||
int brd_scale;
|
||||
int intra_vlc_format;
|
||||
int alternate_scan;
|
||||
int seq_disp_ext;
|
||||
@ -479,6 +484,7 @@ typedef struct MpegEncContext {
|
||||
|
||||
/* RTP specific */
|
||||
int rtp_mode;
|
||||
int rtp_payload_size;
|
||||
|
||||
char *tc_opt_str; ///< timecode option string
|
||||
AVTimecode tc; ///< timecode context
|
||||
@ -547,6 +553,17 @@ typedef struct MpegEncContext {
|
||||
|
||||
/* temporary frames used by b_frame_strategy = 2 */
|
||||
AVFrame *tmp_frames[MAX_B_FRAMES + 2];
|
||||
int b_frame_strategy;
|
||||
int b_sensitivity;
|
||||
|
||||
/* frame skip options for encoding */
|
||||
int frame_skip_threshold;
|
||||
int frame_skip_factor;
|
||||
int frame_skip_exp;
|
||||
int frame_skip_cmp;
|
||||
|
||||
int scenechange_threshold;
|
||||
int noise_reduction;
|
||||
} MpegEncContext;
|
||||
|
||||
/* mpegvideo_enc common options */
|
||||
@ -563,11 +580,28 @@ enum rc_strategy {
|
||||
NB_MPV_RC_STRATEGY
|
||||
};
|
||||
|
||||
#define FF_MPV_OPT_CMP_FUNC \
|
||||
{ "sad", "Sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "sse", "Sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "satd", "Sum of absolute Hadamard transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SATD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "dct", "Sum of absolute DCT transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCT }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "psnr", "Sum of squared quantization errors, low quality", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_PSNR }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "bit", "Number of bits needed for the block", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_BIT }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "rd", "Rate distortion optimal, slow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_RD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "zero", "Zero", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_ZERO }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "vsad", "Sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "vsse", "Sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "nsse", "Noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "dct264", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCT264 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{ "chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }
|
||||
|
||||
#ifndef FF_MPV_OFFSET
|
||||
#define FF_MPV_OFFSET(x) offsetof(MpegEncContext, x)
|
||||
#endif
|
||||
#define FF_MPV_OPT_FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
|
||||
#define FF_MPV_COMMON_OPTS \
|
||||
FF_MPV_OPT_CMP_FUNC, \
|
||||
{ "mpv_flags", "Flags common for all mpegvideo-based encoders.", FF_MPV_OFFSET(mpv_flags), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "mpv_flags" },\
|
||||
{ "skip_rd", "RD optimal MB level residual skipping", 0, AV_OPT_TYPE_CONST, { .i64 = FF_MPV_FLAG_SKIP_RD }, 0, 0, FF_MPV_OPT_FLAGS, "mpv_flags" },\
|
||||
{ "strict_gop", "Strictly enforce gop size", 0, AV_OPT_TYPE_CONST, { .i64 = FF_MPV_FLAG_STRICT_GOP }, 0, 0, FF_MPV_OPT_FLAGS, "mpv_flags" },\
|
||||
@ -606,6 +640,19 @@ enum rc_strategy {
|
||||
{ "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
|
||||
{ "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
|
||||
{ "force_duplicated_matrix", "Always write luma and chroma matrix for mjpeg, useful for rtp streaming.", FF_MPV_OFFSET(force_duplicated_matrix), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS }, \
|
||||
{"b_strategy", "Strategy to choose between I/P/B-frames", FF_MPV_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS }, \
|
||||
{"b_sensitivity", "Adjust sensitivity of b_frame_strategy 1", FF_MPV_OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"brd_scale", "Downscale frames for dynamic B-frame decision", FF_MPV_OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS }, \
|
||||
{"skip_threshold", "Frame skip threshold", FF_MPV_OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"skip_factor", "Frame skip factor", FF_MPV_OFFSET(frame_skip_factor), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"skip_exp", "Frame skip exponent", FF_MPV_OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"skip_cmp", "Frame skip compare function", FF_MPV_OFFSET(frame_skip_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
|
||||
{"sc_threshold", "Scene change threshold", FF_MPV_OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"noise_reduction", "Noise reduction", FF_MPV_OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"mpeg_quant", "Use MPEG quantizers instead of H.263", FF_MPV_OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS }, \
|
||||
{"ps", "RTP payload size in bytes", FF_MPV_OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"mepc", "Motion estimation bitrate penalty compensation (1.0 = 256)", FF_MPV_OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
{"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
|
||||
|
||||
extern const AVOption ff_mpv_generic_options[];
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
#define AV_CODEC_DEFAULT_BITRATE 200*1000
|
||||
|
||||
static const AVOption avcodec_options[] = {
|
||||
{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT_MAX, A|V|E},
|
||||
{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT64_MAX, A|V|E},
|
||||
{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = 128*1000 }, 0, INT_MAX, A|E},
|
||||
{"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far "
|
||||
"ratecontrol is willing to deviate from the target average bitrate value. This is not related "
|
||||
@ -125,8 +125,10 @@ static const AVOption avcodec_options[] = {
|
||||
#if FF_API_RC_STRATEGY
|
||||
{"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E},
|
||||
{"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
#if FF_API_STAT_BITS
|
||||
{"mv_bits", NULL, OFFSET(mv_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
{"header_bits", NULL, OFFSET(header_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
@ -178,7 +180,9 @@ static const AVOption avcodec_options[] = {
|
||||
{"aggressive", "consider things that a sane encoder should not do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
|
||||
{"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
{"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
#if FF_API_MPV_OPT
|
||||
{"qsquish", "deprecated, use encoder private options instead", OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, 0, 99, V|E},
|
||||
{"rc_qmod_amp", "deprecated, use encoder private options instead", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E},
|
||||
@ -242,10 +246,12 @@ static const AVOption avcodec_options[] = {
|
||||
{"deblock", "use strong deblock filter for damaged MBs", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_DEBLOCK }, INT_MIN, INT_MAX, V|D, "ec"},
|
||||
{"favor_inter", "favor predicting from the previous frame", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_FAVOR_INTER }, INT_MIN, INT_MAX, V|D, "ec"},
|
||||
{"bits_per_coded_sample", NULL, OFFSET(bits_per_coded_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"pred", "prediction method", OFFSET(prediction_method), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "pred"},
|
||||
{"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_LEFT }, INT_MIN, INT_MAX, V|E, "pred"},
|
||||
{"plane", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_PLANE }, INT_MIN, INT_MAX, V|E, "pred"},
|
||||
{"median", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_MEDIAN }, INT_MIN, INT_MAX, V|E, "pred"},
|
||||
#endif
|
||||
{"aspect", "sample aspect ratio", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E},
|
||||
{"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"},
|
||||
{"pict", "picture info", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PICT_INFO }, INT_MIN, INT_MAX, V|D, "debug"},
|
||||
@ -283,7 +289,9 @@ static const AVOption avcodec_options[] = {
|
||||
{"ildctcmp", "interlaced DCT compare function", OFFSET(ildct_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
|
||||
{"dia_size", "diamond type & size for motion estimation", OFFSET(dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
{"last_pred", "amount of motion predictors from the previous frame", OFFSET(last_predictor_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"preme", "pre motion estimation", OFFSET(pre_me), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
{"precmp", "pre motion estimation compare function", OFFSET(me_pre_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
|
||||
{"sad", "sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
|
||||
{"sse", "sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
|
||||
@ -323,7 +331,9 @@ static const AVOption avcodec_options[] = {
|
||||
{"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"},
|
||||
#endif /* FF_API_UNUSED_MEMBERS */
|
||||
#endif /* FF_API_CODER_TYPE */
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
{"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
#if FF_API_XVMC
|
||||
{"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
@ -335,12 +345,16 @@ static const AVOption avcodec_options[] = {
|
||||
#if FF_API_STREAM_CODEC_TAG
|
||||
{"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
#endif
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
#if FF_API_MPV_OPT
|
||||
{"lmin", "deprecated, use encoder private options instead", OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E},
|
||||
{"lmax", "deprecated, use encoder private options instead", OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E},
|
||||
#endif
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
{"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
{"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"},
|
||||
#if FF_API_ERROR_RATE
|
||||
@ -380,16 +394,20 @@ static const AVOption avcodec_options[] = {
|
||||
{"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"},
|
||||
{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"},
|
||||
{"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|A|D},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"skip_threshold", "frame skip threshold", OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
{"skip_factor", "frame skip factor", OFFSET(frame_skip_factor), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
{"skip_exp", "frame skip exponent", OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
{"skipcmp", "frame skip compare function", OFFSET(frame_skip_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"},
|
||||
#endif
|
||||
#if FF_API_MPV_OPT
|
||||
{"border_mask", "deprecated, use encoder private options instead", OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E},
|
||||
#endif
|
||||
{"mblmin", "minimum macroblock Lagrange factor (VBR)", OFFSET(mb_lmin), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 2 }, 1, FF_LAMBDA_MAX, V|E},
|
||||
{"mblmax", "maximum macroblock Lagrange factor (VBR)", OFFSET(mb_lmax), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 31 }, 1, FF_LAMBDA_MAX, V|E},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"mepc", "motion estimation bitrate penalty compensation (1.0 = 256)", OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
{"skip_loop_filter", "skip loop filtering process for the selected frames", OFFSET(skip_loop_filter), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"},
|
||||
{"skip_idct" , "skip IDCT/dequantization for the selected frames", OFFSET(skip_idct), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"},
|
||||
{"skip_frame" , "skip decoding for the selected frames", OFFSET(skip_frame), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"},
|
||||
@ -401,20 +419,28 @@ static const AVOption avcodec_options[] = {
|
||||
{"nointra" , "discard all frames except I frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONINTRA}, INT_MIN, INT_MAX, V|D, "avdiscard"},
|
||||
{"all" , "discard all frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_ALL }, INT_MIN, INT_MAX, V|D, "avdiscard"},
|
||||
{"bidir_refine", "refine the two motion vectors used in bidirectional macroblocks", OFFSET(bidir_refine), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 4, V|E},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"brd_scale", "downscale frames for dynamic B-frame decision", OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 10, V|E},
|
||||
#endif
|
||||
{"keyint_min", "minimum interval between IDR-frames", OFFSET(keyint_min), AV_OPT_TYPE_INT, {.i64 = 25 }, INT_MIN, INT_MAX, V|E},
|
||||
{"refs", "reference frames to consider for motion compensation", OFFSET(refs), AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"chromaoffset", "chroma QP offset from luma", OFFSET(chromaoffset), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
{"trellis", "rate-distortion optimal quantization", OFFSET(trellis), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
|
||||
#if FF_API_UNUSED_MEMBERS
|
||||
{"sc_factor", "multiplied by qscale for each frame and added to scene_change_score", OFFSET(scenechange_factor), AV_OPT_TYPE_INT, {.i64 = 6 }, 0, INT_MAX, V|E},
|
||||
#endif /* FF_API_UNUSED_MEMBERS */
|
||||
{"mv0_threshold", NULL, OFFSET(mv0_threshold), AV_OPT_TYPE_INT, {.i64 = 256 }, 0, INT_MAX, V|E},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"b_sensitivity", "adjust sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, V|E},
|
||||
#endif
|
||||
{"compression_level", NULL, OFFSET(compression_level), AV_OPT_TYPE_INT, {.i64 = FF_COMPRESSION_DEFAULT }, INT_MIN, INT_MAX, V|A|E},
|
||||
#if FF_API_PRIVATE_OPT
|
||||
{"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E},
|
||||
{"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E},
|
||||
{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E},
|
||||
#endif
|
||||
{"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"},
|
||||
{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|D, "request_channel_layout"},
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
|
||||
#include "libavutil/avassert.h"
|
||||
#include "libavutil/atomic.h"
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
||||
#include "internal.h"
|
||||
@ -82,7 +83,11 @@ found:
|
||||
goto err_out;
|
||||
}
|
||||
s->key_frame = -1;
|
||||
#if FF_API_CONVERGENCE_DURATION
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
s->convergence_duration = 0;
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
s->dts_sync_point = INT_MIN;
|
||||
s->dts_ref_dts_delta = INT_MIN;
|
||||
s->pts_dts_delta = INT_MIN;
|
||||
|
||||
@ -24,14 +24,6 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#if HAVE_PTHREADS
|
||||
#include <pthread.h>
|
||||
#elif HAVE_W32THREADS
|
||||
#include "compat/w32pthreads.h"
|
||||
#elif HAVE_OS2THREADS
|
||||
#include "compat/os2threads.h"
|
||||
#endif
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "internal.h"
|
||||
#include "pthread_internal.h"
|
||||
@ -41,6 +33,7 @@
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/cpu.h"
|
||||
#include "libavutil/mem.h"
|
||||
#include "libavutil/thread.h"
|
||||
|
||||
typedef int (action_func)(AVCodecContext *c, void *arg);
|
||||
typedef int (action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr);
|
||||
@ -193,6 +186,12 @@ int ff_slice_thread_init(AVCodecContext *avctx)
|
||||
w32thread_init();
|
||||
#endif
|
||||
|
||||
// We cannot do this in the encoder init as the threads are created before
|
||||
if (av_codec_is_encoder(avctx->codec) &&
|
||||
avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO &&
|
||||
avctx->height > 2800)
|
||||
thread_count = avctx->thread_count = 1;
|
||||
|
||||
if (!thread_count) {
|
||||
int nb_cpus = av_cpu_count();
|
||||
if (avctx->height)
|
||||
|
||||
@ -105,7 +105,7 @@ static inline void flush_put_bits(PutBitContext *s)
|
||||
s->bit_buf <<= s->bit_left;
|
||||
#endif
|
||||
while (s->bit_left < 32) {
|
||||
/* XXX: should test end of buffer */
|
||||
av_assert0(s->buf_ptr < s->buf_end);
|
||||
#ifdef BITSTREAM_WRITER_LE
|
||||
*s->buf_ptr++ = s->bit_buf;
|
||||
s->bit_buf >>= 8;
|
||||
|
||||
@ -53,6 +53,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
|
||||
{ AV_PIX_FMT_YUYV422, MKTAG('V', '4', '2', '2') },
|
||||
{ AV_PIX_FMT_YUYV422, MKTAG('V', 'Y', 'U', 'Y') },
|
||||
{ AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'N', 'V') },
|
||||
{ AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', 'V') },
|
||||
{ AV_PIX_FMT_YVYU422, MKTAG('Y', 'V', 'Y', 'U') }, /* Philips */
|
||||
{ AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') },
|
||||
{ AV_PIX_FMT_UYVY422, MKTAG('H', 'D', 'Y', 'C') },
|
||||
@ -119,6 +120,12 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
|
||||
{ AV_PIX_FMT_BGR48BE, MKTAG( 48, 'B', 'G', 'R') },
|
||||
{ AV_PIX_FMT_GRAY16LE, MKTAG('Y', '1', 0 , 16 ) },
|
||||
{ AV_PIX_FMT_GRAY16BE, MKTAG(16 , 0 , '1', 'Y') },
|
||||
{ AV_PIX_FMT_YUV420P9LE, MKTAG('Y', '3', 11 , 9 ) },
|
||||
{ AV_PIX_FMT_YUV420P9BE, MKTAG( 9 , 11 , '3', 'Y') },
|
||||
{ AV_PIX_FMT_YUV422P9LE, MKTAG('Y', '3', 10 , 9 ) },
|
||||
{ AV_PIX_FMT_YUV422P9BE, MKTAG( 9 , 10 , '3', 'Y') },
|
||||
{ AV_PIX_FMT_YUV444P9LE, MKTAG('Y', '3', 0 , 9 ) },
|
||||
{ AV_PIX_FMT_YUV444P9BE, MKTAG( 9 , 0 , '3', 'Y') },
|
||||
{ AV_PIX_FMT_YUV420P10LE, MKTAG('Y', '3', 11 , 10 ) },
|
||||
{ AV_PIX_FMT_YUV420P10BE, MKTAG(10 , 11 , '3', 'Y') },
|
||||
{ AV_PIX_FMT_YUV422P10LE, MKTAG('Y', '3', 10 , 10 ) },
|
||||
@ -147,6 +154,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
|
||||
{ AV_PIX_FMT_YUVA422P, MKTAG('Y', '4', 10 , 8 ) },
|
||||
{ AV_PIX_FMT_YUVA444P, MKTAG('Y', '4', 0 , 8 ) },
|
||||
{ AV_PIX_FMT_YA8, MKTAG('Y', '2', 0 , 8 ) },
|
||||
{ AV_PIX_FMT_PAL8, MKTAG('P', 'A', 'L', 8 ) },
|
||||
|
||||
{ AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) },
|
||||
{ AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') },
|
||||
@ -217,6 +225,40 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
|
||||
{ AV_PIX_FMT_GRAY16BE,MKTAG('b', '1', '6', 'g') },
|
||||
{ AV_PIX_FMT_RGB48BE, MKTAG('b', '4', '8', 'r') },
|
||||
|
||||
/* vlc */
|
||||
{ AV_PIX_FMT_YUV410P, MKTAG('I', '4', '1', '0') },
|
||||
{ AV_PIX_FMT_YUV411P, MKTAG('I', '4', '1', '1') },
|
||||
{ AV_PIX_FMT_YUV422P, MKTAG('I', '4', '2', '2') },
|
||||
{ AV_PIX_FMT_YUV440P, MKTAG('I', '4', '4', '0') },
|
||||
{ AV_PIX_FMT_YUV444P, MKTAG('I', '4', '4', '4') },
|
||||
{ AV_PIX_FMT_YUVJ420P, MKTAG('J', '4', '2', '0') },
|
||||
{ AV_PIX_FMT_YUVJ422P, MKTAG('J', '4', '2', '2') },
|
||||
{ AV_PIX_FMT_YUVJ440P, MKTAG('J', '4', '4', '0') },
|
||||
{ AV_PIX_FMT_YUVJ444P, MKTAG('J', '4', '4', '4') },
|
||||
{ AV_PIX_FMT_YUVA444P, MKTAG('Y', 'U', 'V', 'A') },
|
||||
{ AV_PIX_FMT_YUVA420P, MKTAG('I', '4', '0', 'A') },
|
||||
{ AV_PIX_FMT_YUVA422P, MKTAG('I', '4', '2', 'A') },
|
||||
{ AV_PIX_FMT_RGB8, MKTAG('R', 'G', 'B', '2') },
|
||||
{ AV_PIX_FMT_RGB555LE, MKTAG('R', 'V', '1', '5') },
|
||||
{ AV_PIX_FMT_RGB565LE, MKTAG('R', 'V', '1', '6') },
|
||||
{ AV_PIX_FMT_BGR24, MKTAG('R', 'V', '2', '4') },
|
||||
{ AV_PIX_FMT_BGR0, MKTAG('R', 'V', '3', '2') },
|
||||
{ AV_PIX_FMT_RGBA, MKTAG('A', 'V', '3', '2') },
|
||||
{ AV_PIX_FMT_YUV420P9LE, MKTAG('I', '0', '9', 'L') },
|
||||
{ AV_PIX_FMT_YUV420P9BE, MKTAG('I', '0', '9', 'B') },
|
||||
{ AV_PIX_FMT_YUV422P9LE, MKTAG('I', '2', '9', 'L') },
|
||||
{ AV_PIX_FMT_YUV422P9BE, MKTAG('I', '2', '9', 'B') },
|
||||
{ AV_PIX_FMT_YUV444P9LE, MKTAG('I', '4', '9', 'L') },
|
||||
{ AV_PIX_FMT_YUV444P9BE, MKTAG('I', '4', '9', 'B') },
|
||||
{ AV_PIX_FMT_YUV420P10LE, MKTAG('I', '0', 'A', 'L') },
|
||||
{ AV_PIX_FMT_YUV420P10BE, MKTAG('I', '0', 'A', 'B') },
|
||||
{ AV_PIX_FMT_YUV422P10LE, MKTAG('I', '2', 'A', 'L') },
|
||||
{ AV_PIX_FMT_YUV422P10BE, MKTAG('I', '2', 'A', 'B') },
|
||||
{ AV_PIX_FMT_YUV444P10LE, MKTAG('I', '4', 'A', 'L') },
|
||||
{ AV_PIX_FMT_YUV444P10BE, MKTAG('I', '4', 'A', 'B') },
|
||||
{ AV_PIX_FMT_YUV444P16LE, MKTAG('I', '4', 'F', 'L') },
|
||||
{ AV_PIX_FMT_YUV444P16BE, MKTAG('I', '4', 'F', 'B') },
|
||||
|
||||
/* special */
|
||||
{ AV_PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */
|
||||
{ AV_PIX_FMT_YUV444P, MKTAG('Y', 'V', '2', '4') }, /* YUV444P, swapped UV */
|
||||
@ -241,7 +283,7 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat fmt)
|
||||
}
|
||||
|
||||
const PixelFormatTag avpriv_pix_fmt_bps_avi[] = {
|
||||
{ AV_PIX_FMT_MONOWHITE, 1 },
|
||||
{ AV_PIX_FMT_PAL8, 1 },
|
||||
{ AV_PIX_FMT_PAL8, 2 },
|
||||
{ AV_PIX_FMT_PAL8, 4 },
|
||||
{ AV_PIX_FMT_PAL8, 8 },
|
||||
@ -254,13 +296,13 @@ const PixelFormatTag avpriv_pix_fmt_bps_avi[] = {
|
||||
};
|
||||
|
||||
const PixelFormatTag avpriv_pix_fmt_bps_mov[] = {
|
||||
{ AV_PIX_FMT_MONOWHITE, 1 },
|
||||
{ AV_PIX_FMT_PAL8, 1 },
|
||||
{ AV_PIX_FMT_PAL8, 2 },
|
||||
{ AV_PIX_FMT_PAL8, 4 },
|
||||
{ AV_PIX_FMT_PAL8, 8 },
|
||||
{ AV_PIX_FMT_RGB555BE, 16 },
|
||||
{ AV_PIX_FMT_RGB24, 24 },
|
||||
{ AV_PIX_FMT_ARGB, 32 },
|
||||
{ AV_PIX_FMT_MONOWHITE,33 },
|
||||
{ AV_PIX_FMT_PAL8, 33 },
|
||||
{ AV_PIX_FMT_NONE, 0 },
|
||||
};
|
||||
|
||||
@ -215,8 +215,8 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height)
|
||||
|
||||
s->coded_width = width;
|
||||
s->coded_height = height;
|
||||
s->width = FF_CEIL_RSHIFT(width, s->lowres);
|
||||
s->height = FF_CEIL_RSHIFT(height, s->lowres);
|
||||
s->width = AV_CEIL_RSHIFT(width, s->lowres);
|
||||
s->height = AV_CEIL_RSHIFT(height, s->lowres);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@ -351,6 +351,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
|
||||
case AV_PIX_FMT_GBRP14BE:
|
||||
case AV_PIX_FMT_GBRP16LE:
|
||||
case AV_PIX_FMT_GBRP16BE:
|
||||
case AV_PIX_FMT_GBRAP16LE:
|
||||
case AV_PIX_FMT_GBRAP16BE:
|
||||
w_align = 16; //FIXME assume 16 pixel per macroblock
|
||||
h_align = 16 * 2; // interlaced needs 2 macroblocks height
|
||||
break;
|
||||
@ -521,7 +523,9 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame)
|
||||
do {
|
||||
// NOTE: do not align linesizes individually, this breaks e.g. assumptions
|
||||
// that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
|
||||
av_image_fill_linesizes(linesize, avctx->pix_fmt, w);
|
||||
ret = av_image_fill_linesizes(linesize, avctx->pix_fmt, w);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
// increase alignment of w for next try (rhs gives the lowest bit set in w)
|
||||
w += w & ~(w - 1);
|
||||
|
||||
@ -700,8 +704,8 @@ void ff_color_frame(AVFrame *frame, const int c[4])
|
||||
for (p = 0; p<desc->nb_components; p++) {
|
||||
uint8_t *dst = frame->data[p];
|
||||
int is_chroma = p == 1 || p == 2;
|
||||
int bytes = is_chroma ? FF_CEIL_RSHIFT(frame->width, desc->log2_chroma_w) : frame->width;
|
||||
int height = is_chroma ? FF_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height;
|
||||
int bytes = is_chroma ? AV_CEIL_RSHIFT(frame->width, desc->log2_chroma_w) : frame->width;
|
||||
int height = is_chroma ? AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height;
|
||||
for (y = 0; y < height; y++) {
|
||||
if (desc->comp[0].depth >= 9) {
|
||||
for (x = 0; x<bytes; x++)
|
||||
@ -859,8 +863,8 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
|
||||
}
|
||||
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
|
||||
if (frame->width <= 0 || frame->height <= 0) {
|
||||
frame->width = FFMAX(avctx->width, FF_CEIL_RSHIFT(avctx->coded_width, avctx->lowres));
|
||||
frame->height = FFMAX(avctx->height, FF_CEIL_RSHIFT(avctx->coded_height, avctx->lowres));
|
||||
frame->width = FFMAX(avctx->width, AV_CEIL_RSHIFT(avctx->coded_width, avctx->lowres));
|
||||
frame->height = FFMAX(avctx->height, AV_CEIL_RSHIFT(avctx->coded_height, avctx->lowres));
|
||||
override_dimensions = 0;
|
||||
}
|
||||
}
|
||||
@ -1012,9 +1016,8 @@ static int setup_hwaccel(AVCodecContext *avctx,
|
||||
int ret = 0;
|
||||
|
||||
if (avctx->active_thread_type & FF_THREAD_FRAME) {
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"Hardware accelerated decoding with frame threading is not supported.\n");
|
||||
return AVERROR(EINVAL);
|
||||
av_log(avctx, AV_LOG_WARNING,
|
||||
"Hardware accelerated decoding with frame threading is known to be unstable and its use is discouraged.\n");
|
||||
}
|
||||
|
||||
if (!hwa) {
|
||||
@ -1234,7 +1237,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
|
||||
goto free_and_end;
|
||||
|
||||
if (avctx->codec_whitelist && av_match_list(codec->name, avctx->codec_whitelist, ',') <= 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist\n", codec->name);
|
||||
av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist \'%s\'\n", codec->name, avctx->codec_whitelist);
|
||||
ret = AVERROR(EINVAL);
|
||||
goto free_and_end;
|
||||
}
|
||||
@ -1317,8 +1320,8 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
|
||||
if (!HAVE_THREADS)
|
||||
av_log(avctx, AV_LOG_WARNING, "Warning: not compiled with thread support, using thread emulation\n");
|
||||
|
||||
if (CONFIG_FRAME_THREAD_ENCODER) {
|
||||
ff_unlock_avcodec(codec); //we will instanciate a few encoders thus kick the counter to prevent false detection of a problem
|
||||
if (CONFIG_FRAME_THREAD_ENCODER && av_codec_is_encoder(avctx->codec)) {
|
||||
ff_unlock_avcodec(codec); //we will instantiate a few encoders thus kick the counter to prevent false detection of a problem
|
||||
ret = ff_frame_thread_encoder_init(avctx, options ? *options : NULL);
|
||||
ff_lock_avcodec(avctx, codec);
|
||||
if (ret < 0)
|
||||
@ -1474,6 +1477,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
|
||||
if (!avctx->rc_initial_buffer_occupancy)
|
||||
avctx->rc_initial_buffer_occupancy = avctx->rc_buffer_size * 3 / 4;
|
||||
|
||||
if (avctx->ticks_per_frame && avctx->time_base.num &&
|
||||
avctx->ticks_per_frame > INT_MAX / avctx->time_base.num) {
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"ticks_per_frame %d too large for the timebase %d/%d.",
|
||||
avctx->ticks_per_frame,
|
||||
avctx->time_base.num,
|
||||
avctx->time_base.den);
|
||||
goto free_and_end;
|
||||
}
|
||||
}
|
||||
|
||||
avctx->pts_correction_num_faulty_pts =
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
#include "libavutil/version.h"
|
||||
|
||||
#define LIBAVCODEC_VERSION_MAJOR 57
|
||||
#define LIBAVCODEC_VERSION_MINOR 22
|
||||
#define LIBAVCODEC_VERSION_MICRO 100
|
||||
#define LIBAVCODEC_VERSION_MINOR 24
|
||||
#define LIBAVCODEC_VERSION_MICRO 102
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||
LIBAVCODEC_VERSION_MINOR, \
|
||||
@ -61,6 +61,9 @@
|
||||
#ifndef FF_API_AVCODEC_RESAMPLE
|
||||
#define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT
|
||||
#endif
|
||||
#ifndef FF_API_GETCHROMA
|
||||
#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_MISSING_SAMPLE
|
||||
#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
@ -206,5 +209,8 @@
|
||||
#ifndef FF_API_STAT_BITS
|
||||
#define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||
#endif
|
||||
#ifndef FF_API_PRIVATE_OPT
|
||||
#define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||
#endif
|
||||
|
||||
#endif /* AVCODEC_VERSION_H */
|
||||
|
||||
@ -24,8 +24,8 @@
|
||||
* Determines the duration for each packet.
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_VORBIS_PARSE_H
|
||||
#define AVCODEC_VORBIS_PARSE_H
|
||||
#ifndef AVCODEC_VORBIS_PARSER_H
|
||||
#define AVCODEC_VORBIS_PARSER_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -75,4 +75,4 @@ int av_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
|
||||
|
||||
void av_vorbis_parse_reset(AVVorbisParseContext *s);
|
||||
|
||||
#endif /* AVCODEC_VORBIS_PARSE_H */
|
||||
#endif /* AVCODEC_VORBIS_PARSER_H */
|
||||
|
||||
@ -25,8 +25,8 @@
|
||||
* Determines the duration for each packet.
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_VORBIS_PARSER_H
|
||||
#define AVCODEC_VORBIS_PARSER_H
|
||||
#ifndef AVCODEC_VORBIS_PARSER_INTERNAL_H
|
||||
#define AVCODEC_VORBIS_PARSER_INTERNAL_H
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "vorbis_parser.h"
|
||||
@ -43,4 +43,4 @@ struct AVVorbisParseContext {
|
||||
int prev_mask; ///< bitmask used to get the previous mode flag in each packet
|
||||
};
|
||||
|
||||
#endif /* AVCODEC_VORBIS_PARSER_H */
|
||||
#endif /* AVCODEC_VORBIS_PARSER_INTERNAL_H */
|
||||
|
||||
@ -70,7 +70,13 @@ typedef struct VP9Context {
|
||||
uint8_t ss_h, ss_v;
|
||||
uint8_t last_bpp, bpp, bpp_index, bytesperpixel;
|
||||
uint8_t last_keyframe;
|
||||
enum AVPixelFormat pix_fmt, last_fmt;
|
||||
// sb_cols/rows, rows/cols and last_fmt are used for allocating all internal
|
||||
// arrays, and are thus per-thread. w/h and gf_fmt are synced between threads
|
||||
// and are therefore per-stream. pix_fmt represents the value in the header
|
||||
// of the currently processed frame.
|
||||
int w, h;
|
||||
enum AVPixelFormat pix_fmt, last_fmt, gf_fmt;
|
||||
unsigned sb_cols, sb_rows, rows, cols;
|
||||
ThreadFrame next_refs[8];
|
||||
|
||||
struct {
|
||||
@ -78,7 +84,6 @@ typedef struct VP9Context {
|
||||
uint8_t mblim_lut[64];
|
||||
} filter_lut;
|
||||
unsigned tile_row_start, tile_row_end, tile_col_start, tile_col_end;
|
||||
unsigned sb_cols, sb_rows, rows, cols;
|
||||
struct {
|
||||
prob_context p;
|
||||
uint8_t coef[4][2][2][6][6][3];
|
||||
@ -245,36 +250,45 @@ static int update_size(AVCodecContext *ctx, int w, int h)
|
||||
enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmtp = pix_fmts;
|
||||
VP9Context *s = ctx->priv_data;
|
||||
uint8_t *p;
|
||||
int bytesperpixel = s->bytesperpixel, res;
|
||||
int bytesperpixel = s->bytesperpixel, res, cols, rows;
|
||||
|
||||
av_assert0(w > 0 && h > 0);
|
||||
|
||||
if (s->intra_pred_data[0] && w == ctx->width && h == ctx->height && s->pix_fmt == s->last_fmt)
|
||||
return 0;
|
||||
if (!(s->pix_fmt == s->gf_fmt && w == s->w && h == s->h)) {
|
||||
if ((res = ff_set_dimensions(ctx, w, h)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = ff_set_dimensions(ctx, w, h)) < 0)
|
||||
return res;
|
||||
|
||||
if (s->pix_fmt == AV_PIX_FMT_YUV420P) {
|
||||
if (s->pix_fmt == AV_PIX_FMT_YUV420P) {
|
||||
#if CONFIG_VP9_DXVA2_HWACCEL
|
||||
*fmtp++ = AV_PIX_FMT_DXVA2_VLD;
|
||||
*fmtp++ = AV_PIX_FMT_DXVA2_VLD;
|
||||
#endif
|
||||
#if CONFIG_VP9_D3D11VA_HWACCEL
|
||||
*fmtp++ = AV_PIX_FMT_D3D11VA_VLD;
|
||||
*fmtp++ = AV_PIX_FMT_D3D11VA_VLD;
|
||||
#endif
|
||||
#if CONFIG_VP9_VAAPI_HWACCEL
|
||||
*fmtp++ = AV_PIX_FMT_VAAPI;
|
||||
*fmtp++ = AV_PIX_FMT_VAAPI;
|
||||
#endif
|
||||
}
|
||||
|
||||
*fmtp++ = s->pix_fmt;
|
||||
*fmtp = AV_PIX_FMT_NONE;
|
||||
|
||||
res = ff_thread_get_format(ctx, pix_fmts);
|
||||
if (res < 0)
|
||||
return res;
|
||||
|
||||
ctx->pix_fmt = res;
|
||||
s->gf_fmt = s->pix_fmt;
|
||||
s->w = w;
|
||||
s->h = h;
|
||||
}
|
||||
|
||||
*fmtp++ = s->pix_fmt;
|
||||
*fmtp = AV_PIX_FMT_NONE;
|
||||
cols = (w + 7) >> 3;
|
||||
rows = (h + 7) >> 3;
|
||||
|
||||
res = ff_thread_get_format(ctx, pix_fmts);
|
||||
if (res < 0)
|
||||
return res;
|
||||
if (s->intra_pred_data[0] && cols == s->cols && rows == s->rows && s->pix_fmt == s->last_fmt)
|
||||
return 0;
|
||||
|
||||
ctx->pix_fmt = res;
|
||||
s->last_fmt = s->pix_fmt;
|
||||
s->sb_cols = (w + 63) >> 6;
|
||||
s->sb_rows = (h + 63) >> 6;
|
||||
@ -4292,13 +4306,6 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
|
||||
int i, res;
|
||||
VP9Context *s = dst->priv_data, *ssrc = src->priv_data;
|
||||
|
||||
// detect size changes in other threads
|
||||
if (s->intra_pred_data[0] &&
|
||||
(!ssrc->intra_pred_data[0] || s->cols != ssrc->cols ||
|
||||
s->rows != ssrc->rows || s->bpp != ssrc->bpp || s->pix_fmt != ssrc->pix_fmt)) {
|
||||
free_buffers(s);
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (s->s.frames[i].tf.f->buf[0])
|
||||
vp9_unref_frame(dst, &s->s.frames[i]);
|
||||
@ -4325,6 +4332,9 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
|
||||
s->s.h.segmentation.update_map = ssrc->s.h.segmentation.update_map;
|
||||
s->s.h.segmentation.absolute_vals = ssrc->s.h.segmentation.absolute_vals;
|
||||
s->bytesperpixel = ssrc->bytesperpixel;
|
||||
s->gf_fmt = ssrc->gf_fmt;
|
||||
s->w = ssrc->w;
|
||||
s->h = ssrc->h;
|
||||
s->bpp = ssrc->bpp;
|
||||
s->bpp_index = ssrc->bpp_index;
|
||||
s->pix_fmt = ssrc->pix_fmt;
|
||||
|
||||
@ -27,7 +27,8 @@ DECLARE_ALIGNED(32, const ymm_reg, ff_pw_1) = { 0x0001000100010001ULL, 0x000
|
||||
DECLARE_ALIGNED(32, const ymm_reg, ff_pw_2) = { 0x0002000200020002ULL, 0x0002000200020002ULL,
|
||||
0x0002000200020002ULL, 0x0002000200020002ULL };
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_pw_3) = { 0x0003000300030003ULL, 0x0003000300030003ULL };
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_pw_4) = { 0x0004000400040004ULL, 0x0004000400040004ULL };
|
||||
DECLARE_ALIGNED(32, const ymm_reg, ff_pw_4) = { 0x0004000400040004ULL, 0x0004000400040004ULL,
|
||||
0x0004000400040004ULL, 0x0004000400040004ULL };
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_pw_5) = { 0x0005000500050005ULL, 0x0005000500050005ULL };
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_pw_8) = { 0x0008000800080008ULL, 0x0008000800080008ULL };
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_pw_9) = { 0x0009000900090009ULL, 0x0009000900090009ULL };
|
||||
@ -74,7 +75,8 @@ DECLARE_ALIGNED(32, const ymm_reg, ff_pb_3) = { 0x0303030303030303ULL, 0x030
|
||||
0x0303030303030303ULL, 0x0303030303030303ULL };
|
||||
DECLARE_ALIGNED(32, const xmm_reg, ff_pb_15) = { 0x0F0F0F0F0F0F0F0FULL, 0x0F0F0F0F0F0F0F0FULL };
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_pb_80) = { 0x8080808080808080ULL, 0x8080808080808080ULL };
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_pb_FE) = { 0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL };
|
||||
DECLARE_ALIGNED(32, const ymm_reg, ff_pb_FE) = { 0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL,
|
||||
0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL };
|
||||
DECLARE_ALIGNED(8, const uint64_t, ff_pb_FC) = 0xFCFCFCFCFCFCFCFCULL;
|
||||
|
||||
DECLARE_ALIGNED(16, const xmm_reg, ff_ps_neg) = { 0x8000000080000000ULL, 0x8000000080000000ULL };
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
extern const ymm_reg ff_pw_1;
|
||||
extern const ymm_reg ff_pw_2;
|
||||
extern const xmm_reg ff_pw_3;
|
||||
extern const xmm_reg ff_pw_4;
|
||||
extern const ymm_reg ff_pw_4;
|
||||
extern const xmm_reg ff_pw_5;
|
||||
extern const xmm_reg ff_pw_8;
|
||||
extern const xmm_reg ff_pw_9;
|
||||
@ -57,7 +57,7 @@ extern const ymm_reg ff_pb_1;
|
||||
extern const ymm_reg ff_pb_2;
|
||||
extern const ymm_reg ff_pb_3;
|
||||
extern const xmm_reg ff_pb_80;
|
||||
extern const xmm_reg ff_pb_FE;
|
||||
extern const ymm_reg ff_pb_FE;
|
||||
extern const uint64_t ff_pb_FC;
|
||||
|
||||
extern const xmm_reg ff_ps_neg;
|
||||
|
||||
@ -193,14 +193,10 @@ hvar_fn
|
||||
mov valb, [srcq+%2-1]
|
||||
%elif (%2-%%off) == 2
|
||||
mov valw, [srcq+%2-2]
|
||||
%elifidn %1, body
|
||||
%else
|
||||
mov valb, [srcq+%2-1]
|
||||
sal vald, 16
|
||||
ror vald, 16
|
||||
mov valw, [srcq+%2-3]
|
||||
%elifidn %1, bottom
|
||||
movd mm %+ %%mmx_idx, [srcq+%2-4]
|
||||
%else ; top
|
||||
movd mm %+ %%mmx_idx, [srcq+%2-3]
|
||||
%endif
|
||||
%endif ; (%2-%%off) >= 1
|
||||
%endmacro ; READ_NUM_BYTES
|
||||
@ -253,18 +249,13 @@ hvar_fn
|
||||
mov [dstq+%2-1], valb
|
||||
%elif (%2-%%off) == 2
|
||||
mov [dstq+%2-2], valw
|
||||
%elifidn %1, body
|
||||
mov [dstq+%2-3], valw
|
||||
sar vald, 16
|
||||
mov [dstq+%2-1], valb
|
||||
%else
|
||||
movd vald, mm %+ %%mmx_idx
|
||||
%ifidn %1, bottom
|
||||
sar vald, 8
|
||||
%endif
|
||||
mov [dstq+%2-3], valw
|
||||
sar vald, 16
|
||||
ror vald, 16
|
||||
mov [dstq+%2-1], valb
|
||||
%ifnidn %1, body
|
||||
ror vald, 16
|
||||
%endif
|
||||
%endif
|
||||
%endif ; (%2-%%off) >= 1
|
||||
%endmacro ; WRITE_NUM_BYTES
|
||||
|
||||
@ -377,7 +377,7 @@ av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp, int bpp, int bitexact)
|
||||
init_ipred(32, avx, v, VERT);
|
||||
}
|
||||
|
||||
if (EXTERNAL_AVX2(cpu_flags)) {
|
||||
if (EXTERNAL_AVX2_FAST(cpu_flags)) {
|
||||
init_fpel_func(1, 1, 32, avg, _8, avx2);
|
||||
init_fpel_func(0, 1, 64, avg, _8, avx2);
|
||||
if (ARCH_X86_64) {
|
||||
|
||||
@ -129,7 +129,7 @@ av_cold void ff_vp9dsp_init_16bpp_x86(VP9DSPContext *dsp)
|
||||
init_ipred_funcs(hd, HOR_DOWN, 16, avx);
|
||||
}
|
||||
|
||||
if (EXTERNAL_AVX2(cpu_flags)) {
|
||||
if (EXTERNAL_AVX2_FAST(cpu_flags)) {
|
||||
init_fpel_func(2, 1, 32, avg, _16, avx2);
|
||||
init_fpel_func(1, 1, 64, avg, _16, avx2);
|
||||
init_fpel_func(0, 1, 128, avg, _16, avx2);
|
||||
|
||||
@ -225,7 +225,7 @@ av_cold void INIT_FUNC(VP9DSPContext *dsp, int bitexact)
|
||||
init_lpf_funcs(BPC, avx);
|
||||
}
|
||||
|
||||
if (EXTERNAL_AVX2(cpu_flags)) {
|
||||
if (EXTERNAL_AVX2_FAST(cpu_flags)) {
|
||||
#if HAVE_AVX2_EXTERNAL
|
||||
init_subpel3_32_64(0, put, BPC, avx2);
|
||||
init_subpel3_32_64(1, avg, BPC, avx2);
|
||||
|
||||
@ -326,13 +326,18 @@ int av_match_name(const char *name, const char *names)
|
||||
return 0;
|
||||
|
||||
namelen = strlen(name);
|
||||
while ((p = strchr(names, ','))) {
|
||||
while (*names) {
|
||||
int negate = '-' == *names;
|
||||
p = strchr(names, ',');
|
||||
if (!p)
|
||||
p = names + strlen(names);
|
||||
names += negate;
|
||||
len = FFMAX(p - names, namelen);
|
||||
if (!av_strncasecmp(name, names, len))
|
||||
return 1;
|
||||
names = p + 1;
|
||||
if (!av_strncasecmp(name, names, len) || !strncmp("ALL", names, FFMAX(3, p - names)))
|
||||
return !negate;
|
||||
names = p + (*p == ',');
|
||||
}
|
||||
return !av_strcasecmp(name, names);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
|
||||
|
||||
@ -284,6 +284,11 @@ const char *av_dirname(char *path);
|
||||
|
||||
/**
|
||||
* Match instances of a name in a comma-separated list of names.
|
||||
* List entries are checked from the start to the end of the names list,
|
||||
* the first match ends further processing. If an entry prefixed with '-'
|
||||
* matches, then 0 is returned. The "ALL" list entry is considered to
|
||||
* match all names.
|
||||
*
|
||||
* @param name Name to look for.
|
||||
* @param names List of names.
|
||||
* @return 1 on match, 0 otherwise.
|
||||
|
||||
@ -54,9 +54,12 @@
|
||||
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
|
||||
/* assume b>0 */
|
||||
#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
|
||||
/* assume a>0 and b>0 */
|
||||
#define FF_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
|
||||
/* Fast a/(1<<b) rounded toward +inf. Assume a>=0 and b>=0 */
|
||||
#define AV_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
|
||||
: ((a) + (1<<(b)) - 1) >> (b))
|
||||
/* Backwards compat. */
|
||||
#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT
|
||||
|
||||
#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
|
||||
#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
|
||||
|
||||
@ -211,7 +214,7 @@ static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
|
||||
*/
|
||||
static av_always_inline av_const int av_clip_intp2_c(int a, int p)
|
||||
{
|
||||
if ((a + (1 << p)) & ~((2 << p) - 1))
|
||||
if (((unsigned)a + (1 << p)) & ~((2 << p) - 1))
|
||||
return (a >> 31) ^ ((1 << p) - 1);
|
||||
else
|
||||
return a;
|
||||
@ -331,6 +334,11 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
|
||||
return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
|
||||
}
|
||||
|
||||
static av_always_inline av_const int av_parity_c(uint32_t v)
|
||||
{
|
||||
return av_popcount(v) & 1;
|
||||
}
|
||||
|
||||
#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
|
||||
#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
|
||||
|
||||
@ -351,13 +359,13 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
|
||||
* to prevent undefined results.
|
||||
*/
|
||||
#define GET_UTF8(val, GET_BYTE, ERROR)\
|
||||
val= GET_BYTE;\
|
||||
val= (GET_BYTE);\
|
||||
{\
|
||||
uint32_t top = (val & 128) >> 1;\
|
||||
if ((val & 0xc0) == 0x80 || val >= 0xFE)\
|
||||
ERROR\
|
||||
while (val & top) {\
|
||||
int tmp= GET_BYTE - 128;\
|
||||
int tmp= (GET_BYTE) - 128;\
|
||||
if(tmp>>6)\
|
||||
ERROR\
|
||||
val= (val<<6) + tmp;\
|
||||
@ -517,3 +525,6 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
|
||||
#ifndef av_popcount64
|
||||
# define av_popcount64 av_popcount64_c
|
||||
#endif
|
||||
#ifndef av_parity
|
||||
# define av_parity av_parity_c
|
||||
#endif
|
||||
|
||||
@ -24,13 +24,16 @@
|
||||
#define CPUEXT_SUFFIX(flags, suffix, cpuext) \
|
||||
(HAVE_ ## cpuext ## suffix && ((flags) & AV_CPU_FLAG_ ## cpuext))
|
||||
|
||||
#define CPUEXT_SUFFIX_FAST(flags, suffix, cpuext) \
|
||||
#define CPUEXT_SUFFIX_FAST2(flags, suffix, cpuext, slow_cpuext) \
|
||||
(HAVE_ ## cpuext ## suffix && ((flags) & AV_CPU_FLAG_ ## cpuext) && \
|
||||
!((flags) & AV_CPU_FLAG_ ## cpuext ## SLOW))
|
||||
!((flags) & AV_CPU_FLAG_ ## slow_cpuext ## SLOW))
|
||||
|
||||
#define CPUEXT_SUFFIX_SLOW(flags, suffix, cpuext) \
|
||||
#define CPUEXT_SUFFIX_SLOW2(flags, suffix, cpuext, slow_cpuext) \
|
||||
(HAVE_ ## cpuext ## suffix && ((flags) & AV_CPU_FLAG_ ## cpuext) && \
|
||||
((flags) & AV_CPU_FLAG_ ## cpuext ## SLOW))
|
||||
((flags) & AV_CPU_FLAG_ ## slow_cpuext ## SLOW))
|
||||
|
||||
#define CPUEXT_SUFFIX_FAST(flags, suffix, cpuext) CPUEXT_SUFFIX_FAST2(flags, suffix, cpuext, cpuext)
|
||||
#define CPUEXT_SUFFIX_SLOW(flags, suffix, cpuext) CPUEXT_SUFFIX_SLOW2(flags, suffix, cpuext, cpuext)
|
||||
|
||||
#define CPUEXT(flags, cpuext) CPUEXT_SUFFIX(flags, , cpuext)
|
||||
#define CPUEXT_FAST(flags, cpuext) CPUEXT_SUFFIX_FAST(flags, , cpuext)
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/* Automatically generated by version.sh, do not manually edit! */
|
||||
#ifndef AVUTIL_FFVERSION_H
|
||||
#define AVUTIL_FFVERSION_H
|
||||
#define FFMPEG_VERSION "n2.8.1-16-gfcb8ee9"
|
||||
#define FFMPEG_VERSION "n3.0-1-g0aa2fbd"
|
||||
#endif /* AVUTIL_FFVERSION_H */
|
||||
|
||||
@ -160,5 +160,8 @@ AVFixedDSPContext * avpriv_alloc_fixed_dsp(int bit_exact)
|
||||
fdsp->butterflies_fixed = butterflies_fixed_c;
|
||||
fdsp->scalarproduct_fixed = scalarproduct_fixed_c;
|
||||
|
||||
if (ARCH_X86)
|
||||
ff_fixed_dsp_init_x86(fdsp);
|
||||
|
||||
return fdsp;
|
||||
}
|
||||
|
||||
@ -161,6 +161,8 @@ typedef struct AVFixedDSPContext {
|
||||
*/
|
||||
AVFixedDSPContext * avpriv_alloc_fixed_dsp(int strict);
|
||||
|
||||
void ff_fixed_dsp_init_x86(AVFixedDSPContext *fdsp);
|
||||
|
||||
/**
|
||||
* Calculate the square root
|
||||
*
|
||||
|
||||
@ -188,7 +188,7 @@ static int get_video_buffer(AVFrame *frame, int align)
|
||||
for (i = 0; i < 4 && frame->linesize[i]; i++) {
|
||||
int h = FFALIGN(frame->height, 32);
|
||||
if (i == 1 || i == 2)
|
||||
h = FF_CEIL_RSHIFT(h, desc->log2_chroma_h);
|
||||
h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h);
|
||||
|
||||
frame->buf[i] = av_buffer_alloc(frame->linesize[i] * h + 16 + 16/*STRIDE_ALIGN*/ - 1);
|
||||
if (!frame->buf[i])
|
||||
@ -357,6 +357,7 @@ FF_DISABLE_DEPRECATION_WARNINGS
|
||||
dst->qscale_table = NULL;
|
||||
dst->qstride = 0;
|
||||
dst->qscale_type = 0;
|
||||
av_buffer_unref(&dst->qp_table_buf);
|
||||
if (src->qp_table_buf) {
|
||||
dst->qp_table_buf = av_buffer_ref(src->qp_table_buf);
|
||||
if (dst->qp_table_buf) {
|
||||
@ -728,7 +729,12 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type)
|
||||
case AV_FRAME_DATA_DOWNMIX_INFO: return "Metadata relevant to a downmix procedure";
|
||||
case AV_FRAME_DATA_REPLAYGAIN: return "AVReplayGain";
|
||||
case AV_FRAME_DATA_DISPLAYMATRIX: return "3x3 displaymatrix";
|
||||
case AV_FRAME_DATA_AFD: return "Active format description";
|
||||
case AV_FRAME_DATA_MOTION_VECTORS: return "Motion vectors";
|
||||
case AV_FRAME_DATA_SKIP_SAMPLES: return "Skip samples";
|
||||
case AV_FRAME_DATA_AUDIO_SERVICE_TYPE: return "Audio service type";
|
||||
case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata";
|
||||
case AV_FRAME_DATA_GOP_TIMECODE: return "GOP timecode";
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -106,12 +106,22 @@ enum AVFrameSideDataType {
|
||||
* @endcode
|
||||
*/
|
||||
AV_FRAME_DATA_SKIP_SAMPLES,
|
||||
|
||||
/**
|
||||
* This side data must be associated with an audio frame and corresponds to
|
||||
* enum AVAudioServiceType defined in avcodec.h.
|
||||
*/
|
||||
AV_FRAME_DATA_AUDIO_SERVICE_TYPE,
|
||||
/**
|
||||
* Mastering display metadata associated with a video frame. The payload is
|
||||
* an AVMasteringDisplayMetadata type and contains information about the
|
||||
* mastering display color volume.
|
||||
*/
|
||||
AV_FRAME_DATA_MASTERING_DISPLAY_METADATA,
|
||||
/**
|
||||
* The GOP timecode in 25 bit timecode format. Data format is 64-bit integer.
|
||||
* This is set on the first frame of a GOP that has a temporal reference of 0.
|
||||
*/
|
||||
AV_FRAME_DATA_GOP_TIMECODE
|
||||
};
|
||||
|
||||
enum AVActiveFormatDescription {
|
||||
|
||||
@ -125,7 +125,6 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei
|
||||
|
||||
if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
|
||||
desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
|
||||
size[0] = (size[0] + 3) & ~3;
|
||||
data[1] = ptr + size[0]; /* palette is stored here as 256 32 bits words */
|
||||
return size[0] + 256 * 4;
|
||||
}
|
||||
@ -216,8 +215,13 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
|
||||
av_free(buf);
|
||||
return ret;
|
||||
}
|
||||
if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
|
||||
if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
|
||||
avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt);
|
||||
if (align < 4) {
|
||||
av_log(NULL, AV_LOG_ERROR, "Formats with a palette require a minimum alignment of 4\n");
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
}
|
||||
|
||||
if ((desc->flags & AV_PIX_FMT_FLAG_PAL ||
|
||||
desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) &&
|
||||
@ -325,7 +329,7 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
|
||||
return;
|
||||
}
|
||||
if (i == 1 || i == 2) {
|
||||
h = FF_CEIL_RSHIFT(height, desc->log2_chroma_h);
|
||||
h = AV_CEIL_RSHIFT(height, desc->log2_chroma_h);
|
||||
}
|
||||
av_image_copy_plane(dst_data[i], dst_linesizes[i],
|
||||
src_data[i], src_linesizes[i],
|
||||
@ -370,7 +374,7 @@ int av_image_get_buffer_size(enum AVPixelFormat pix_fmt,
|
||||
|
||||
// do not include palette for these pseudo-paletted formats
|
||||
if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
|
||||
return width * height;
|
||||
return FFALIGN(width, align) * height;
|
||||
|
||||
return av_image_fill_arrays(data, linesize, NULL, pix_fmt,
|
||||
width, height, align);
|
||||
@ -408,7 +412,8 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
|
||||
}
|
||||
|
||||
if (desc->flags & AV_PIX_FMT_FLAG_PAL) {
|
||||
uint32_t *d32 = (uint32_t *)(((size_t)dst + 3) & ~3);
|
||||
uint32_t *d32 = (uint32_t *)dst;
|
||||
|
||||
for (i = 0; i<256; i++)
|
||||
AV_WL32(d32 + i, AV_RN32(src_data[1] + 4*i));
|
||||
}
|
||||
|
||||
@ -153,6 +153,12 @@ static av_always_inline av_const unsigned ff_clz_c(unsigned x)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if AV_GCC_VERSION_AT_LEAST(3,4)
|
||||
#ifndef av_parity
|
||||
#define av_parity __builtin_parity
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
||||
@ -343,6 +343,25 @@ static av_always_inline av_const int avpriv_isnan(double x)
|
||||
: avpriv_isnan(x))
|
||||
#endif /* HAVE_ISNAN */
|
||||
|
||||
#if !HAVE_ISFINITE
|
||||
static av_always_inline av_const int avpriv_isfinitef(float x)
|
||||
{
|
||||
uint32_t v = av_float2int(x);
|
||||
return (v & 0x7f800000) != 0x7f800000;
|
||||
}
|
||||
|
||||
static av_always_inline av_const int avpriv_isfinite(double x)
|
||||
{
|
||||
uint64_t v = av_double2int(x);
|
||||
return (v & 0x7ff0000000000000) != 0x7ff0000000000000;
|
||||
}
|
||||
|
||||
#define isfinite(x) \
|
||||
(sizeof(x) == sizeof(float) \
|
||||
? avpriv_isfinitef(x) \
|
||||
: avpriv_isfinite(x))
|
||||
#endif /* HAVE_ISFINITE */
|
||||
|
||||
#if !HAVE_HYPOT
|
||||
static inline av_const double hypot(double x, double y)
|
||||
{
|
||||
|
||||
@ -1476,10 +1476,11 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags)
|
||||
while ((t = av_dict_get(*options, "", t, AV_DICT_IGNORE_SUFFIX))) {
|
||||
ret = av_opt_set(obj, t->key, t->value, search_flags);
|
||||
if (ret == AVERROR_OPTION_NOT_FOUND)
|
||||
av_dict_set(&tmp, t->key, t->value, 0);
|
||||
else if (ret < 0) {
|
||||
ret = av_dict_set(&tmp, t->key, t->value, 0);
|
||||
if (ret < 0) {
|
||||
av_log(obj, AV_LOG_ERROR, "Error setting option %s to value %s.\n", t->key, t->value);
|
||||
break;
|
||||
av_dict_free(&tmp);
|
||||
return ret;
|
||||
}
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
@ -31,13 +31,14 @@
|
||||
/* #include "random_seed.h" */
|
||||
#include "time_internal.h"
|
||||
#include "parseutils.h"
|
||||
#include "fftime.h"
|
||||
|
||||
#ifdef TEST
|
||||
|
||||
#define av_get_random_seed av_get_random_seed_deterministic
|
||||
static uint32_t av_get_random_seed_deterministic(void);
|
||||
|
||||
#define time(t) 1331972053
|
||||
#define av_gettime() 1331972053200000
|
||||
|
||||
#endif
|
||||
|
||||
@ -558,28 +559,34 @@ time_t av_timegm(struct tm *tm)
|
||||
int av_parse_time(int64_t *timeval, const char *timestr, int duration)
|
||||
{
|
||||
const char *p, *q;
|
||||
int64_t t;
|
||||
int64_t t, now64;
|
||||
time_t now;
|
||||
struct tm dt = { 0 }, tmbuf;
|
||||
int today = 0, negative = 0, microseconds = 0;
|
||||
int i;
|
||||
static const char * const date_fmt[] = {
|
||||
"%Y-%m-%d",
|
||||
"%Y - %m - %d",
|
||||
"%Y%m%d",
|
||||
};
|
||||
static const char * const time_fmt[] = {
|
||||
"%H:%M:%S",
|
||||
"%H%M%S",
|
||||
};
|
||||
static const char * const tz_fmt[] = {
|
||||
"%H:%M",
|
||||
"%H%M",
|
||||
"%H",
|
||||
};
|
||||
|
||||
p = timestr;
|
||||
q = NULL;
|
||||
*timeval = INT64_MIN;
|
||||
if (!duration) {
|
||||
now = time(0);
|
||||
now64 = av_gettime();
|
||||
now = now64 / 1000000;
|
||||
|
||||
if (!av_strcasecmp(timestr, "now")) {
|
||||
*timeval = (int64_t) now * 1000000;
|
||||
*timeval = now64;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -598,8 +605,11 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
|
||||
}
|
||||
p = q;
|
||||
|
||||
if (*p == 'T' || *p == 't' || *p == ' ')
|
||||
if (*p == 'T' || *p == 't')
|
||||
p++;
|
||||
else
|
||||
while (av_isspace(*p))
|
||||
p++;
|
||||
|
||||
/* parse the hour-minute-second part */
|
||||
for (i = 0; i < FF_ARRAY_ELEMS(time_fmt); i++) {
|
||||
@ -653,7 +663,23 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
|
||||
t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec;
|
||||
} else {
|
||||
int is_utc = *q == 'Z' || *q == 'z';
|
||||
int tzoffset = 0;
|
||||
q += is_utc;
|
||||
if (!today && !is_utc && (*q == '+' || *q == '-')) {
|
||||
struct tm tz = { 0 };
|
||||
int sign = (*q == '+' ? -1 : 1);
|
||||
q++;
|
||||
p = q;
|
||||
for (i = 0; i < FF_ARRAY_ELEMS(tz_fmt); i++) {
|
||||
q = av_small_strptime(p, tz_fmt[i], &tz);
|
||||
if (q)
|
||||
break;
|
||||
}
|
||||
if (!q)
|
||||
return AVERROR(EINVAL);
|
||||
tzoffset = sign * (tz.tm_hour * 60 + tz.tm_min) * 60;
|
||||
is_utc = 1;
|
||||
}
|
||||
if (today) { /* fill in today's date */
|
||||
struct tm dt2 = is_utc ? *gmtime_r(&now, &tmbuf) : *localtime_r(&now, &tmbuf);
|
||||
dt2.tm_hour = dt.tm_hour;
|
||||
@ -662,6 +688,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
|
||||
dt = dt2;
|
||||
}
|
||||
t = is_utc ? av_timegm(&dt) : mktime(&dt);
|
||||
t += tzoffset;
|
||||
}
|
||||
|
||||
/* Check that we are at the end of the string */
|
||||
@ -858,7 +885,10 @@ int main(void)
|
||||
"now",
|
||||
"12:35:46",
|
||||
"2000-12-20 0:02:47.5z",
|
||||
"2012 - 02-22 17:44:07",
|
||||
"2000-12-20T010247.6",
|
||||
"2000-12-12 1:35:46+05:30",
|
||||
"2002-12-12 22:30:40-02",
|
||||
};
|
||||
static const char * const duration_string[] = {
|
||||
"2:34:56.79",
|
||||
@ -870,7 +900,7 @@ int main(void)
|
||||
|
||||
av_log_set_level(AV_LOG_DEBUG);
|
||||
putenv(tzstr);
|
||||
printf("(now is 2012-03-17 09:14:13 +0100, local time is UTC+1)\n");
|
||||
printf("(now is 2012-03-17 09:14:13.2 +0100, local time is UTC+1)\n");
|
||||
for (i = 0; i < FF_ARRAY_ELEMS(time_string); i++) {
|
||||
printf("%-24s -> ", time_string[i]);
|
||||
if (av_parse_time(&tv, time_string[i], 0)) {
|
||||
|
||||
@ -2004,6 +2004,30 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
|
||||
},
|
||||
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,
|
||||
},
|
||||
[AV_PIX_FMT_P010LE] = {
|
||||
.name = "p010le",
|
||||
.nb_components = 3,
|
||||
.log2_chroma_w = 1,
|
||||
.log2_chroma_h = 1,
|
||||
.comp = {
|
||||
{ 0, 2, 0, 6, 10, 1, 9, 1 }, /* Y */
|
||||
{ 1, 4, 0, 6, 10, 3, 9, 1 }, /* U */
|
||||
{ 1, 4, 2, 6, 10, 3, 9, 3 }, /* V */
|
||||
},
|
||||
.flags = AV_PIX_FMT_FLAG_PLANAR,
|
||||
},
|
||||
[AV_PIX_FMT_P010BE] = {
|
||||
.name = "p010be",
|
||||
.nb_components = 3,
|
||||
.log2_chroma_w = 1,
|
||||
.log2_chroma_h = 1,
|
||||
.comp = {
|
||||
{ 0, 2, 0, 6, 10, 1, 9, 1 }, /* Y */
|
||||
{ 1, 4, 0, 6, 10, 3, 9, 1 }, /* U */
|
||||
{ 1, 4, 2, 6, 10, 3, 9, 3 }, /* V */
|
||||
},
|
||||
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
|
||||
},
|
||||
};
|
||||
#if FF_API_PLUS1_MINUS1
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
|
||||
@ -292,8 +292,8 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
|
||||
* you do check the return code!
|
||||
*
|
||||
* @param[in] pix_fmt the pixel format
|
||||
* @param[out] h_shift store log2_chroma_w
|
||||
* @param[out] v_shift store log2_chroma_h
|
||||
* @param[out] h_shift store log2_chroma_w (horizontal/width shift)
|
||||
* @param[out] v_shift store log2_chroma_h (vertical/height shift)
|
||||
*
|
||||
* @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
|
||||
*/
|
||||
|
||||
@ -289,6 +289,9 @@ enum AVPixelFormat {
|
||||
|
||||
AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
|
||||
|
||||
AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, little-endian
|
||||
AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, big-endian
|
||||
|
||||
AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
|
||||
};
|
||||
|
||||
@ -365,6 +368,7 @@ enum AVPixelFormat {
|
||||
#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
|
||||
#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
|
||||
#define AV_PIX_FMT_AYUV64 AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
|
||||
#define AV_PIX_FMT_P010 AV_PIX_FMT_NE(P010BE, P010LE)
|
||||
|
||||
/**
|
||||
* Chromaticity coordinates of the source primaries.
|
||||
|
||||
@ -18,6 +18,9 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef AVUTIL_QSORT_H
|
||||
#define AVUTIL_QSORT_H
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -115,3 +118,5 @@
|
||||
FFSWAP(type*, p, tmp);\
|
||||
}\
|
||||
} while (0)
|
||||
|
||||
#endif /* AVUTIL_QSORT_H */
|
||||
|
||||
@ -30,6 +30,102 @@
|
||||
|
||||
#if HAVE_PTHREADS
|
||||
#include <pthread.h>
|
||||
|
||||
#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
|
||||
|
||||
#include "log.h"
|
||||
|
||||
#define ASSERT_PTHREAD_NORET(func, ...) do { \
|
||||
int ret = func(__VA_ARGS__); \
|
||||
if (ret) { \
|
||||
av_log(NULL, AV_LOG_FATAL, AV_STRINGIFY(func) \
|
||||
" failed with error: %s\n", av_err2str(AVERROR(ret))); \
|
||||
abort(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define ASSERT_PTHREAD(func, ...) do { \
|
||||
ASSERT_PTHREAD_NORET(func, __VA_ARGS__); \
|
||||
return 0; \
|
||||
} while (0)
|
||||
|
||||
static inline int strict_pthread_join(pthread_t thread, void **value_ptr)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_join, thread, value_ptr);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
|
||||
{
|
||||
if (attr) {
|
||||
ASSERT_PTHREAD_NORET(pthread_mutex_init, mutex, attr);
|
||||
} else {
|
||||
pthread_mutexattr_t local_attr;
|
||||
ASSERT_PTHREAD_NORET(pthread_mutexattr_init, &local_attr);
|
||||
ASSERT_PTHREAD_NORET(pthread_mutexattr_settype, &local_attr, PTHREAD_MUTEX_ERRORCHECK);
|
||||
ASSERT_PTHREAD_NORET(pthread_mutex_init, mutex, &local_attr);
|
||||
ASSERT_PTHREAD_NORET(pthread_mutexattr_destroy, &local_attr);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int strict_pthread_mutex_destroy(pthread_mutex_t *mutex)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_mutex_destroy, mutex);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_mutex_lock(pthread_mutex_t *mutex)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_mutex_lock, mutex);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_mutex_unlock(pthread_mutex_t *mutex)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_mutex_unlock, mutex);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_cond_init, cond, attr);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_cond_destroy(pthread_cond_t *cond)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_cond_destroy, cond);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_cond_signal(pthread_cond_t *cond)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_cond_signal, cond);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_cond_broadcast, cond);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_cond_wait, cond, mutex);
|
||||
}
|
||||
|
||||
static inline int strict_pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
|
||||
{
|
||||
ASSERT_PTHREAD(pthread_once, once_control, init_routine);
|
||||
}
|
||||
|
||||
#define pthread_join strict_pthread_join
|
||||
#define pthread_mutex_init strict_pthread_mutex_init
|
||||
#define pthread_mutex_destroy strict_pthread_mutex_destroy
|
||||
#define pthread_mutex_lock strict_pthread_mutex_lock
|
||||
#define pthread_mutex_unlock strict_pthread_mutex_unlock
|
||||
#define pthread_cond_init strict_pthread_cond_init
|
||||
#define pthread_cond_destroy strict_pthread_cond_destroy
|
||||
#define pthread_cond_signal strict_pthread_cond_signal
|
||||
#define pthread_cond_broadcast strict_pthread_cond_broadcast
|
||||
#define pthread_cond_wait strict_pthread_cond_wait
|
||||
#define pthread_once strict_pthread_once
|
||||
#endif
|
||||
|
||||
#elif HAVE_OS2THREADS
|
||||
#include "compat/os2threads.h"
|
||||
#else
|
||||
|
||||
@ -53,7 +53,7 @@ unsigned avutil_version(void)
|
||||
av_assert0(((size_t)-1) > 0); // C guarantees this but if false on a platform we care about revert at least b284e1ffe343d6697fb950d1ee517bafda8a9844
|
||||
|
||||
if (av_sat_dadd32(1, 2) != 5) {
|
||||
av_log(NULL, AV_LOG_FATAL, "Libavutil has been build with a broken binutils, please upgrade binutils and rebuild\n");
|
||||
av_log(NULL, AV_LOG_FATAL, "Libavutil has been built with a broken binutils, please upgrade binutils and rebuild\n");
|
||||
abort();
|
||||
}
|
||||
|
||||
|
||||
@ -64,8 +64,8 @@
|
||||
*/
|
||||
|
||||
#define LIBAVUTIL_VERSION_MAJOR 55
|
||||
#define LIBAVUTIL_VERSION_MINOR 12
|
||||
#define LIBAVUTIL_VERSION_MICRO 100
|
||||
#define LIBAVUTIL_VERSION_MINOR 17
|
||||
#define LIBAVUTIL_VERSION_MICRO 103
|
||||
|
||||
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
|
||||
LIBAVUTIL_VERSION_MINOR, \
|
||||
@ -126,4 +126,3 @@
|
||||
*/
|
||||
|
||||
#endif /* AVUTIL_VERSION_H */
|
||||
|
||||
|
||||
@ -182,13 +182,11 @@ int ff_get_cpu_flags_x86(void)
|
||||
|
||||
/* Similar to the above but for AVX functions on AMD processors.
|
||||
This is necessary only for functions using YMM registers on Bulldozer
|
||||
based CPUs as they lack 256-bits execution units. SSE/AVX functions
|
||||
using XMM registers are always faster on them.
|
||||
and Jaguar based CPUs as they lack 256-bits execution units. SSE/AVX
|
||||
functions using XMM registers are always faster on them.
|
||||
AV_CPU_FLAG_AVX and AV_CPU_FLAG_AVXSLOW are both set so that AVX is
|
||||
used unless explicitly disabled by checking AV_CPU_FLAG_AVXSLOW.
|
||||
TODO: Confirm if Excavator is affected or not by this once it's
|
||||
released, and update the check if necessary. Same for btver2. */
|
||||
if (family == 0x15 && (rval & AV_CPU_FLAG_AVX))
|
||||
used unless explicitly disabled by checking AV_CPU_FLAG_AVXSLOW. */
|
||||
if ((family == 0x15 || family == 0x16) && (rval & AV_CPU_FLAG_AVX))
|
||||
rval |= AV_CPU_FLAG_AVXSLOW;
|
||||
}
|
||||
|
||||
|
||||
@ -68,8 +68,12 @@
|
||||
#define EXTERNAL_AVX_SLOW(flags) CPUEXT_SUFFIX_SLOW(flags, _EXTERNAL, AVX)
|
||||
#define EXTERNAL_XOP(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, XOP)
|
||||
#define EXTERNAL_FMA3(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, FMA3)
|
||||
#define EXTERNAL_FMA3_FAST(flags) CPUEXT_SUFFIX_FAST2(flags, _EXTERNAL, FMA3, AVX)
|
||||
#define EXTERNAL_FMA3_SLOW(flags) CPUEXT_SUFFIX_SLOW2(flags, _EXTERNAL, FMA3, AVX)
|
||||
#define EXTERNAL_FMA4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, FMA4)
|
||||
#define EXTERNAL_AVX2(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX2)
|
||||
#define EXTERNAL_AVX2_FAST(flags) CPUEXT_SUFFIX_FAST2(flags, _EXTERNAL, AVX2, AVX)
|
||||
#define EXTERNAL_AVX2_SLOW(flags) CPUEXT_SUFFIX_SLOW2(flags, _EXTERNAL, AVX2, AVX)
|
||||
#define EXTERNAL_AESNI(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AESNI)
|
||||
|
||||
#define INLINE_AMD3DNOW(flags) CPUEXT_SUFFIX(flags, _INLINE, AMD3DNOW)
|
||||
|
||||
@ -34,7 +34,13 @@ void avpriv_emms_yasm(void);
|
||||
*/
|
||||
static av_always_inline void emms_c(void)
|
||||
{
|
||||
/* Some inlined functions may also use mmx instructions regardless of
|
||||
* runtime cpuflags. With that in mind, we unconditionally empty the
|
||||
* mmx state if the target cpu chosen at configure time supports it.
|
||||
*/
|
||||
#if !defined(__MMX__)
|
||||
if(av_get_cpu_flags() & AV_CPU_FLAG_MMX)
|
||||
#endif
|
||||
__asm__ volatile ("emms" ::: "memory");
|
||||
}
|
||||
#elif HAVE_MMX && HAVE_MM_EMPTY
|
||||
|
||||
48
media/ffvpx/libavutil/x86/fixed_dsp.asm
Normal file
48
media/ffvpx/libavutil/x86/fixed_dsp.asm
Normal file
@ -0,0 +1,48 @@
|
||||
;*****************************************************************************
|
||||
;* x86-optimized Float DSP functions
|
||||
;*
|
||||
;* Copyright 2016 James Almer
|
||||
;*
|
||||
;* This file is part of FFmpeg.
|
||||
;*
|
||||
;* FFmpeg is free software; you can redistribute it and/or
|
||||
;* modify it under the terms of the GNU Lesser General Public
|
||||
;* License as published by the Free Software Foundation; either
|
||||
;* version 2.1 of the License, or (at your option) any later version.
|
||||
;*
|
||||
;* FFmpeg is distributed in the hope that it will be useful,
|
||||
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
;* Lesser General Public License for more details.
|
||||
;*
|
||||
;* You should have received a copy of the GNU Lesser General Public
|
||||
;* License along with FFmpeg; if not, write to the Free Software
|
||||
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
;******************************************************************************
|
||||
|
||||
%include "x86util.asm"
|
||||
|
||||
SECTION .text
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_butterflies_fixed(float *src0, float *src1, int len);
|
||||
;-----------------------------------------------------------------------------
|
||||
INIT_XMM sse2
|
||||
cglobal butterflies_fixed, 3,3,3, src0, src1, len
|
||||
shl lend, 2
|
||||
add src0q, lenq
|
||||
add src1q, lenq
|
||||
neg lenq
|
||||
|
||||
align 16
|
||||
.loop:
|
||||
mova m0, [src0q + lenq]
|
||||
mova m1, [src1q + lenq]
|
||||
mova m2, m0
|
||||
paddd m0, m1
|
||||
psubd m2, m1
|
||||
mova [src0q + lenq], m0
|
||||
mova [src1q + lenq], m2
|
||||
add lenq, mmsize
|
||||
jl .loop
|
||||
RET
|
||||
@ -16,16 +16,20 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_IMGCONVERT_H
|
||||
#define AVCODEC_IMGCONVERT_H
|
||||
#include "config.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/cpu.h"
|
||||
#include "libavutil/fixed_dsp.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#include "version.h"
|
||||
void ff_butterflies_fixed_sse2(int *src0, int *src1, int len);
|
||||
|
||||
/* 1/2^n downscaling functions */
|
||||
void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
|
||||
void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
|
||||
void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
|
||||
av_cold void ff_fixed_dsp_init_x86(AVFixedDSPContext *fdsp)
|
||||
{
|
||||
int cpu_flags = av_get_cpu_flags();
|
||||
|
||||
#endif /* AVCODEC_IMGCONVERT_H */
|
||||
if (EXTERNAL_SSE2(cpu_flags)) {
|
||||
fdsp->butterflies_fixed = ff_butterflies_fixed_sse2;
|
||||
}
|
||||
}
|
||||
@ -332,10 +332,10 @@ VECTOR_FMUL_REVERSE
|
||||
; float scalarproduct_float_sse(const float *v1, const float *v2, int len)
|
||||
INIT_XMM sse
|
||||
cglobal scalarproduct_float, 3,3,2, v1, v2, offset
|
||||
shl offsetd, 2
|
||||
add v1q, offsetq
|
||||
add v2q, offsetq
|
||||
neg offsetq
|
||||
shl offsetq, 2
|
||||
sub v1q, offsetq
|
||||
sub v2q, offsetq
|
||||
xorps xmm0, xmm0
|
||||
.loop:
|
||||
movaps xmm1, [v1q+offsetq]
|
||||
@ -359,12 +359,7 @@ cglobal scalarproduct_float, 3,3,2, v1, v2, offset
|
||||
;-----------------------------------------------------------------------------
|
||||
INIT_XMM sse
|
||||
cglobal butterflies_float, 3,3,3, src0, src1, len
|
||||
%if ARCH_X86_64
|
||||
movsxd lenq, lend
|
||||
%endif
|
||||
test lenq, lenq
|
||||
jz .end
|
||||
shl lenq, 2
|
||||
shl lend, 2
|
||||
add src0q, lenq
|
||||
add src1q, lenq
|
||||
neg lenq
|
||||
@ -377,5 +372,4 @@ cglobal butterflies_float, 3,3,3, src0, src1, len
|
||||
mova [src0q + lenq], m0
|
||||
add lenq, mmsize
|
||||
jl .loop
|
||||
.end:
|
||||
REP_RET
|
||||
|
||||
@ -92,7 +92,7 @@ av_cold void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp)
|
||||
fdsp->vector_fmul_add = ff_vector_fmul_add_avx;
|
||||
fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_avx;
|
||||
}
|
||||
if (EXTERNAL_FMA3(cpu_flags) && !(cpu_flags & AV_CPU_FLAG_AVXSLOW)) {
|
||||
if (EXTERNAL_FMA3_FAST(cpu_flags)) {
|
||||
fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_fma3;
|
||||
fdsp->vector_fmul_add = ff_vector_fmul_add_fma3;
|
||||
}
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
#define AVUTIL_X86_INTMATH_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#if HAVE_FAST_CLZ
|
||||
#if defined(_MSC_VER)
|
||||
#include <intrin.h>
|
||||
@ -98,6 +99,38 @@ static av_always_inline av_const unsigned av_mod_uintp2_bmi2(unsigned a, unsigne
|
||||
|
||||
#endif /* __BMI2__ */
|
||||
|
||||
#if defined(__SSE2__) && !defined(__INTEL_COMPILER)
|
||||
|
||||
#define av_clipd av_clipd_sse2
|
||||
static av_always_inline av_const double av_clipd_sse2(double a, double amin, double amax)
|
||||
{
|
||||
#if defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
|
||||
if (amin > amax) abort();
|
||||
#endif
|
||||
__asm__ ("minsd %2, %0 \n\t"
|
||||
"maxsd %1, %0 \n\t"
|
||||
: "+&x"(a) : "xm"(amin), "xm"(amax));
|
||||
return a;
|
||||
}
|
||||
|
||||
#endif /* __SSE2__ */
|
||||
|
||||
#if defined(__SSE__) && !defined(__INTEL_COMPILER)
|
||||
|
||||
#define av_clipf av_clipf_sse
|
||||
static av_always_inline av_const float av_clipf_sse(float a, float amin, float amax)
|
||||
{
|
||||
#if defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
|
||||
if (amin > amax) abort();
|
||||
#endif
|
||||
__asm__ ("minss %2, %0 \n\t"
|
||||
"maxss %1, %0 \n\t"
|
||||
: "+&x"(a) : "xm"(amin), "xm"(amax));
|
||||
return a;
|
||||
}
|
||||
|
||||
#endif /* __SSE__ */
|
||||
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#endif /* AVUTIL_X86_INTMATH_H */
|
||||
|
||||
@ -125,8 +125,7 @@ cglobal update_lls, 2,5,8, ctx, var, i, j, covar2
|
||||
.ret:
|
||||
REP_RET
|
||||
|
||||
%if HAVE_AVX_EXTERNAL
|
||||
INIT_YMM avx
|
||||
%macro UPDATE_LLS 0
|
||||
cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
|
||||
%define covarq ctxq
|
||||
mov countd, [ctxq + LLSModel.indep_count]
|
||||
@ -140,6 +139,18 @@ cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
|
||||
vbroadcastsd ymm6, [varq + iq*8 + 16]
|
||||
vbroadcastsd ymm7, [varq + iq*8 + 24]
|
||||
vextractf128 xmm3, ymm1, 1
|
||||
%if cpuflag(fma3)
|
||||
mova ymm0, COVAR(iq ,0)
|
||||
mova xmm2, COVAR(iq+2,2)
|
||||
fmaddpd ymm0, ymm1, ymm4, ymm0
|
||||
fmaddpd xmm2, xmm3, xmm6, xmm2
|
||||
fmaddpd ymm1, ymm5, ymm1, COVAR(iq ,1)
|
||||
fmaddpd xmm3, xmm7, xmm3, COVAR(iq+2,3)
|
||||
mova COVAR(iq ,0), ymm0
|
||||
mova COVAR(iq ,1), ymm1
|
||||
mova COVAR(iq+2,2), xmm2
|
||||
mova COVAR(iq+2,3), xmm3
|
||||
%else
|
||||
vmulpd ymm0, ymm1, ymm4
|
||||
vmulpd ymm1, ymm1, ymm5
|
||||
vmulpd xmm2, xmm3, xmm6
|
||||
@ -148,12 +159,26 @@ cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
|
||||
ADDPD_MEM COVAR(iq ,1), ymm1
|
||||
ADDPD_MEM COVAR(iq+2,2), xmm2
|
||||
ADDPD_MEM COVAR(iq+2,3), xmm3
|
||||
%endif ; cpuflag(fma3)
|
||||
lea jd, [iq + 4]
|
||||
cmp jd, count2d
|
||||
jg .skip4x4
|
||||
.loop4x4:
|
||||
; Compute all 16 pairwise products of a 4x4 block
|
||||
mova ymm3, [varq + jq*8]
|
||||
%if cpuflag(fma3)
|
||||
mova ymm0, COVAR(jq, 0)
|
||||
mova ymm1, COVAR(jq, 1)
|
||||
mova ymm2, COVAR(jq, 2)
|
||||
fmaddpd ymm0, ymm3, ymm4, ymm0
|
||||
fmaddpd ymm1, ymm3, ymm5, ymm1
|
||||
fmaddpd ymm2, ymm3, ymm6, ymm2
|
||||
fmaddpd ymm3, ymm7, ymm3, COVAR(jq,3)
|
||||
mova COVAR(jq, 0), ymm0
|
||||
mova COVAR(jq, 1), ymm1
|
||||
mova COVAR(jq, 2), ymm2
|
||||
mova COVAR(jq, 3), ymm3
|
||||
%else
|
||||
vmulpd ymm0, ymm3, ymm4
|
||||
vmulpd ymm1, ymm3, ymm5
|
||||
vmulpd ymm2, ymm3, ymm6
|
||||
@ -162,6 +187,7 @@ cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
|
||||
ADDPD_MEM COVAR(jq,1), ymm1
|
||||
ADDPD_MEM COVAR(jq,2), ymm2
|
||||
ADDPD_MEM COVAR(jq,3), ymm3
|
||||
%endif ; cpuflag(fma3)
|
||||
add jd, 4
|
||||
cmp jd, count2d
|
||||
jle .loop4x4
|
||||
@ -169,6 +195,19 @@ cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
|
||||
cmp jd, countd
|
||||
jg .skip2x4
|
||||
mova xmm3, [varq + jq*8]
|
||||
%if cpuflag(fma3)
|
||||
mova xmm0, COVAR(jq, 0)
|
||||
mova xmm1, COVAR(jq, 1)
|
||||
mova xmm2, COVAR(jq, 2)
|
||||
fmaddpd xmm0, xmm3, xmm4, xmm0
|
||||
fmaddpd xmm1, xmm3, xmm5, xmm1
|
||||
fmaddpd xmm2, xmm3, xmm6, xmm2
|
||||
fmaddpd xmm3, xmm7, xmm3, COVAR(jq,3)
|
||||
mova COVAR(jq, 0), xmm0
|
||||
mova COVAR(jq, 1), xmm1
|
||||
mova COVAR(jq, 2), xmm2
|
||||
mova COVAR(jq, 3), xmm3
|
||||
%else
|
||||
vmulpd xmm0, xmm3, xmm4
|
||||
vmulpd xmm1, xmm3, xmm5
|
||||
vmulpd xmm2, xmm3, xmm6
|
||||
@ -177,6 +216,7 @@ cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
|
||||
ADDPD_MEM COVAR(jq,1), xmm1
|
||||
ADDPD_MEM COVAR(jq,2), xmm2
|
||||
ADDPD_MEM COVAR(jq,3), xmm3
|
||||
%endif ; cpuflag(fma3)
|
||||
.skip2x4:
|
||||
add id, 4
|
||||
add covarq, 4*COVAR_STRIDE
|
||||
@ -187,14 +227,29 @@ cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
|
||||
mov jd, id
|
||||
.loop2x1:
|
||||
vmovddup xmm0, [varq + iq*8]
|
||||
%if cpuflag(fma3)
|
||||
mova xmm1, [varq + jq*8]
|
||||
fmaddpd xmm0, xmm1, xmm0, COVAR(jq,0)
|
||||
mova COVAR(jq,0), xmm0
|
||||
%else
|
||||
vmulpd xmm0, [varq + jq*8]
|
||||
ADDPD_MEM COVAR(jq,0), xmm0
|
||||
%endif ; cpuflag(fma3)
|
||||
inc id
|
||||
add covarq, COVAR_STRIDE
|
||||
cmp id, countd
|
||||
jle .loop2x1
|
||||
.ret:
|
||||
REP_RET
|
||||
%endmacro ; UPDATE_LLS
|
||||
|
||||
%if HAVE_AVX_EXTERNAL
|
||||
INIT_YMM avx
|
||||
UPDATE_LLS
|
||||
%endif
|
||||
%if HAVE_FMA3_EXTERNAL
|
||||
INIT_YMM fma3
|
||||
UPDATE_LLS
|
||||
%endif
|
||||
|
||||
INIT_XMM sse2
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
|
||||
void ff_update_lls_sse2(LLSModel *m, const double *var);
|
||||
void ff_update_lls_avx(LLSModel *m, const double *var);
|
||||
void ff_update_lls_fma3(LLSModel *m, const double *var);
|
||||
double ff_evaluate_lls_sse2(LLSModel *m, const double *var, int order);
|
||||
|
||||
av_cold void ff_init_lls_x86(LLSModel *m)
|
||||
@ -38,4 +39,7 @@ av_cold void ff_init_lls_x86(LLSModel *m)
|
||||
if (EXTERNAL_AVX_FAST(cpu_flags)) {
|
||||
m->update_lls = ff_update_lls_avx;
|
||||
}
|
||||
if (EXTERNAL_FMA3_FAST(cpu_flags)) {
|
||||
m->update_lls = ff_update_lls_fma3;
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,6 +8,8 @@ SOURCES += [
|
||||
'cpu.c',
|
||||
'cpuid.asm',
|
||||
'emms.asm',
|
||||
'fixed_dsp.asm',
|
||||
'fixed_dsp_init.c',
|
||||
'float_dsp.asm',
|
||||
'float_dsp_init.c',
|
||||
'lls.asm',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
;*****************************************************************************
|
||||
;* x86inc.asm: x264asm abstraction layer
|
||||
;*****************************************************************************
|
||||
;* Copyright (C) 2005-2015 x264 project
|
||||
;* Copyright (C) 2005-2016 x264 project
|
||||
;*
|
||||
;* Authors: Loren Merritt <lorenm@u.washington.edu>
|
||||
;* Anton Mitrofanov <BugMaster@narod.ru>
|
||||
@ -183,9 +183,9 @@
|
||||
%define e%1h %3
|
||||
%define r%1b %2
|
||||
%define e%1b %2
|
||||
%if ARCH_X86_64 == 0
|
||||
%define r%1 e%1
|
||||
%endif
|
||||
%if ARCH_X86_64 == 0
|
||||
%define r%1 e%1
|
||||
%endif
|
||||
%endmacro
|
||||
|
||||
DECLARE_REG_SIZE ax, al, ah
|
||||
@ -295,7 +295,7 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
|
||||
|
||||
%macro ASSERT 1
|
||||
%if (%1) == 0
|
||||
%error assert failed
|
||||
%error assertion ``%1'' failed
|
||||
%endif
|
||||
%endmacro
|
||||
|
||||
@ -386,8 +386,11 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
|
||||
%if %1 != 0 && required_stack_alignment > STACK_ALIGNMENT
|
||||
%if %1 > 0
|
||||
%assign regs_used (regs_used + 1)
|
||||
%elif ARCH_X86_64 && regs_used == num_args && num_args <= 4 + UNIX64 * 2
|
||||
%warning "Stack pointer will overwrite register argument"
|
||||
%endif
|
||||
%if ARCH_X86_64 && regs_used < 5 + UNIX64 * 3
|
||||
; Ensure that we don't clobber any registers containing arguments. For UNIX64 we also preserve r6 (rax)
|
||||
; since it's used as a hidden argument in vararg functions to specify the number of vector registers used.
|
||||
%assign regs_used 5 + UNIX64 * 3
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
@ -501,9 +504,9 @@ DECLARE_REG 14, R15, 120
|
||||
%macro RET 0
|
||||
WIN64_RESTORE_XMM_INTERNAL rsp
|
||||
POP_IF_USED 14, 13, 12, 11, 10, 9, 8, 7
|
||||
%if mmsize == 32
|
||||
vzeroupper
|
||||
%endif
|
||||
%if mmsize == 32
|
||||
vzeroupper
|
||||
%endif
|
||||
AUTO_REP_RET
|
||||
%endmacro
|
||||
|
||||
@ -540,17 +543,17 @@ DECLARE_REG 14, R15, 72
|
||||
%define has_epilogue regs_used > 9 || mmsize == 32 || stack_size > 0
|
||||
|
||||
%macro RET 0
|
||||
%if stack_size_padded > 0
|
||||
%if required_stack_alignment > STACK_ALIGNMENT
|
||||
mov rsp, rstkm
|
||||
%else
|
||||
add rsp, stack_size_padded
|
||||
%endif
|
||||
%endif
|
||||
%if stack_size_padded > 0
|
||||
%if required_stack_alignment > STACK_ALIGNMENT
|
||||
mov rsp, rstkm
|
||||
%else
|
||||
add rsp, stack_size_padded
|
||||
%endif
|
||||
%endif
|
||||
POP_IF_USED 14, 13, 12, 11, 10, 9
|
||||
%if mmsize == 32
|
||||
vzeroupper
|
||||
%endif
|
||||
%if mmsize == 32
|
||||
vzeroupper
|
||||
%endif
|
||||
AUTO_REP_RET
|
||||
%endmacro
|
||||
|
||||
@ -596,29 +599,29 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
|
||||
%define has_epilogue regs_used > 3 || mmsize == 32 || stack_size > 0
|
||||
|
||||
%macro RET 0
|
||||
%if stack_size_padded > 0
|
||||
%if required_stack_alignment > STACK_ALIGNMENT
|
||||
mov rsp, rstkm
|
||||
%else
|
||||
add rsp, stack_size_padded
|
||||
%endif
|
||||
%endif
|
||||
%if stack_size_padded > 0
|
||||
%if required_stack_alignment > STACK_ALIGNMENT
|
||||
mov rsp, rstkm
|
||||
%else
|
||||
add rsp, stack_size_padded
|
||||
%endif
|
||||
%endif
|
||||
POP_IF_USED 6, 5, 4, 3
|
||||
%if mmsize == 32
|
||||
vzeroupper
|
||||
%endif
|
||||
%if mmsize == 32
|
||||
vzeroupper
|
||||
%endif
|
||||
AUTO_REP_RET
|
||||
%endmacro
|
||||
|
||||
%endif ;======================================================================
|
||||
|
||||
%if WIN64 == 0
|
||||
%macro WIN64_SPILL_XMM 1
|
||||
%endmacro
|
||||
%macro WIN64_RESTORE_XMM 1
|
||||
%endmacro
|
||||
%macro WIN64_PUSH_XMM 0
|
||||
%endmacro
|
||||
%macro WIN64_SPILL_XMM 1
|
||||
%endmacro
|
||||
%macro WIN64_RESTORE_XMM 1
|
||||
%endmacro
|
||||
%macro WIN64_PUSH_XMM 0
|
||||
%endmacro
|
||||
%endif
|
||||
|
||||
; On AMD cpus <=K10, an ordinary ret is slow if it immediately follows either
|
||||
@ -631,24 +634,26 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
|
||||
%else
|
||||
rep ret
|
||||
%endif
|
||||
annotate_function_size
|
||||
%endmacro
|
||||
|
||||
%define last_branch_adr $$
|
||||
%macro AUTO_REP_RET 0
|
||||
%ifndef cpuflags
|
||||
times ((last_branch_adr-$)>>31)+1 rep ; times 1 iff $ != last_branch_adr.
|
||||
%elif notcpuflag(ssse3)
|
||||
times ((last_branch_adr-$)>>31)+1 rep
|
||||
%if notcpuflag(ssse3)
|
||||
times ((last_branch_adr-$)>>31)+1 rep ; times 1 iff $ == last_branch_adr.
|
||||
%endif
|
||||
ret
|
||||
annotate_function_size
|
||||
%endmacro
|
||||
|
||||
%macro BRANCH_INSTR 0-*
|
||||
%rep %0
|
||||
%macro %1 1-2 %1
|
||||
%2 %1
|
||||
%%branch_instr:
|
||||
%xdefine last_branch_adr %%branch_instr
|
||||
%if notcpuflag(ssse3)
|
||||
%%branch_instr equ $
|
||||
%xdefine last_branch_adr %%branch_instr
|
||||
%endif
|
||||
%endmacro
|
||||
%rotate 1
|
||||
%endrep
|
||||
@ -663,6 +668,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
%elif %2
|
||||
jmp %1
|
||||
%endif
|
||||
annotate_function_size
|
||||
%endmacro
|
||||
|
||||
;=============================================================================
|
||||
@ -684,6 +690,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
cglobal_internal 0, %1 %+ SUFFIX, %2
|
||||
%endmacro
|
||||
%macro cglobal_internal 2-3+
|
||||
annotate_function_size
|
||||
%if %1
|
||||
%xdefine %%FUNCTION_PREFIX private_prefix
|
||||
%xdefine %%VISIBILITY hidden
|
||||
@ -697,6 +704,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
CAT_XDEFINE cglobaled_, %2, 1
|
||||
%endif
|
||||
%xdefine current_function %2
|
||||
%xdefine current_function_section __SECT__
|
||||
%if FORMAT_ELF
|
||||
global %2:function %%VISIBILITY
|
||||
%else
|
||||
@ -745,6 +753,24 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
[SECTION .note.GNU-stack noalloc noexec nowrite progbits]
|
||||
%endif
|
||||
|
||||
; Tell debuggers how large the function was.
|
||||
; This may be invoked multiple times per function; we rely on later instances overriding earlier ones.
|
||||
; This is invoked by RET and similar macros, and also cglobal does it for the previous function,
|
||||
; but if the last function in a source file doesn't use any of the standard macros for its epilogue,
|
||||
; then its size might be unspecified.
|
||||
%macro annotate_function_size 0
|
||||
%ifdef __YASM_VER__
|
||||
%ifdef current_function
|
||||
%if FORMAT_ELF
|
||||
current_function_section
|
||||
%%ecf equ $
|
||||
size current_function %%ecf - current_function
|
||||
__SECT__
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endmacro
|
||||
|
||||
; cpuflags
|
||||
|
||||
%assign cpuflags_mmx (1<<0)
|
||||
@ -845,14 +871,14 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
%define movnta movntq
|
||||
%assign %%i 0
|
||||
%rep 8
|
||||
CAT_XDEFINE m, %%i, mm %+ %%i
|
||||
CAT_XDEFINE nnmm, %%i, %%i
|
||||
%assign %%i %%i+1
|
||||
CAT_XDEFINE m, %%i, mm %+ %%i
|
||||
CAT_XDEFINE nnmm, %%i, %%i
|
||||
%assign %%i %%i+1
|
||||
%endrep
|
||||
%rep 8
|
||||
CAT_UNDEF m, %%i
|
||||
CAT_UNDEF nnmm, %%i
|
||||
%assign %%i %%i+1
|
||||
CAT_UNDEF m, %%i
|
||||
CAT_UNDEF nnmm, %%i
|
||||
%assign %%i %%i+1
|
||||
%endrep
|
||||
INIT_CPUFLAGS %1
|
||||
%endmacro
|
||||
@ -863,7 +889,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
%define mmsize 16
|
||||
%define num_mmregs 8
|
||||
%if ARCH_X86_64
|
||||
%define num_mmregs 16
|
||||
%define num_mmregs 16
|
||||
%endif
|
||||
%define mova movdqa
|
||||
%define movu movdqu
|
||||
@ -871,9 +897,9 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
%define movnta movntdq
|
||||
%assign %%i 0
|
||||
%rep num_mmregs
|
||||
CAT_XDEFINE m, %%i, xmm %+ %%i
|
||||
CAT_XDEFINE nnxmm, %%i, %%i
|
||||
%assign %%i %%i+1
|
||||
CAT_XDEFINE m, %%i, xmm %+ %%i
|
||||
CAT_XDEFINE nnxmm, %%i, %%i
|
||||
%assign %%i %%i+1
|
||||
%endrep
|
||||
INIT_CPUFLAGS %1
|
||||
%endmacro
|
||||
@ -884,7 +910,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
%define mmsize 32
|
||||
%define num_mmregs 8
|
||||
%if ARCH_X86_64
|
||||
%define num_mmregs 16
|
||||
%define num_mmregs 16
|
||||
%endif
|
||||
%define mova movdqa
|
||||
%define movu movdqu
|
||||
@ -892,9 +918,9 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
|
||||
%define movnta movntdq
|
||||
%assign %%i 0
|
||||
%rep num_mmregs
|
||||
CAT_XDEFINE m, %%i, ymm %+ %%i
|
||||
CAT_XDEFINE nnymm, %%i, %%i
|
||||
%assign %%i %%i+1
|
||||
CAT_XDEFINE m, %%i, ymm %+ %%i
|
||||
CAT_XDEFINE nnymm, %%i, %%i
|
||||
%assign %%i %%i+1
|
||||
%endrep
|
||||
INIT_CPUFLAGS %1
|
||||
%endmacro
|
||||
@ -918,7 +944,7 @@ INIT_XMM
|
||||
%assign i 0
|
||||
%rep 16
|
||||
DECLARE_MMCAST i
|
||||
%assign i i+1
|
||||
%assign i i+1
|
||||
%endrep
|
||||
|
||||
; I often want to use macros that permute their arguments. e.g. there's no
|
||||
@ -936,23 +962,23 @@ INIT_XMM
|
||||
; doesn't cost any cycles.
|
||||
|
||||
%macro PERMUTE 2-* ; takes a list of pairs to swap
|
||||
%rep %0/2
|
||||
%xdefine %%tmp%2 m%2
|
||||
%rotate 2
|
||||
%endrep
|
||||
%rep %0/2
|
||||
%xdefine m%1 %%tmp%2
|
||||
CAT_XDEFINE nn, m%1, %1
|
||||
%rotate 2
|
||||
%endrep
|
||||
%rep %0/2
|
||||
%xdefine %%tmp%2 m%2
|
||||
%rotate 2
|
||||
%endrep
|
||||
%rep %0/2
|
||||
%xdefine m%1 %%tmp%2
|
||||
CAT_XDEFINE nn, m%1, %1
|
||||
%rotate 2
|
||||
%endrep
|
||||
%endmacro
|
||||
|
||||
%macro SWAP 2+ ; swaps a single chain (sometimes more concise than pairs)
|
||||
%ifnum %1 ; SWAP 0, 1, ...
|
||||
SWAP_INTERNAL_NUM %1, %2
|
||||
%else ; SWAP m0, m1, ...
|
||||
SWAP_INTERNAL_NAME %1, %2
|
||||
%endif
|
||||
%ifnum %1 ; SWAP 0, 1, ...
|
||||
SWAP_INTERNAL_NUM %1, %2
|
||||
%else ; SWAP m0, m1, ...
|
||||
SWAP_INTERNAL_NAME %1, %2
|
||||
%endif
|
||||
%endmacro
|
||||
|
||||
%macro SWAP_INTERNAL_NUM 2-*
|
||||
@ -962,7 +988,7 @@ INIT_XMM
|
||||
%xdefine m%2 %%tmp
|
||||
CAT_XDEFINE nn, m%1, %1
|
||||
CAT_XDEFINE nn, m%2, %2
|
||||
%rotate 1
|
||||
%rotate 1
|
||||
%endrep
|
||||
%endmacro
|
||||
|
||||
@ -970,7 +996,7 @@ INIT_XMM
|
||||
%xdefine %%args nn %+ %1
|
||||
%rep %0-1
|
||||
%xdefine %%args %%args, nn %+ %2
|
||||
%rotate 1
|
||||
%rotate 1
|
||||
%endrep
|
||||
SWAP_INTERNAL_NUM %%args
|
||||
%endmacro
|
||||
@ -987,7 +1013,7 @@ INIT_XMM
|
||||
%assign %%i 0
|
||||
%rep num_mmregs
|
||||
CAT_XDEFINE %%f, %%i, m %+ %%i
|
||||
%assign %%i %%i+1
|
||||
%assign %%i %%i+1
|
||||
%endrep
|
||||
%endmacro
|
||||
|
||||
@ -997,7 +1023,7 @@ INIT_XMM
|
||||
%rep num_mmregs
|
||||
CAT_XDEFINE m, %%i, %1_m %+ %%i
|
||||
CAT_XDEFINE nn, m %+ %%i, %%i
|
||||
%assign %%i %%i+1
|
||||
%assign %%i %%i+1
|
||||
%endrep
|
||||
%endif
|
||||
%endmacro
|
||||
@ -1053,7 +1079,7 @@ INIT_XMM
|
||||
%endif
|
||||
CAT_XDEFINE sizeofxmm, i, 16
|
||||
CAT_XDEFINE sizeofymm, i, 32
|
||||
%assign i i+1
|
||||
%assign i i+1
|
||||
%endrep
|
||||
%undef i
|
||||
|
||||
@ -1430,7 +1456,7 @@ AVX_INSTR pfmul, 3dnow, 1, 0, 1
|
||||
%else
|
||||
CAT_XDEFINE q, j, i
|
||||
%endif
|
||||
%assign i i+1
|
||||
%assign i i+1
|
||||
%endrep
|
||||
%undef i
|
||||
%undef j
|
||||
@ -1457,47 +1483,44 @@ FMA_INSTR pmadcswd, pmaddwd, paddd
|
||||
; This lets us use tzcnt without bumping the yasm version requirement yet.
|
||||
%define tzcnt rep bsf
|
||||
|
||||
; convert FMA4 to FMA3 if possible
|
||||
%macro FMA4_INSTR 4
|
||||
%macro %1 4-8 %1, %2, %3, %4
|
||||
%if cpuflag(fma4)
|
||||
v%5 %1, %2, %3, %4
|
||||
%elifidn %1, %2
|
||||
v%6 %1, %4, %3 ; %1 = %1 * %3 + %4
|
||||
%elifidn %1, %3
|
||||
v%7 %1, %2, %4 ; %1 = %2 * %1 + %4
|
||||
%elifidn %1, %4
|
||||
v%8 %1, %2, %3 ; %1 = %2 * %3 + %1
|
||||
%else
|
||||
%error fma3 emulation of ``%5 %1, %2, %3, %4'' is not supported
|
||||
%endif
|
||||
%endmacro
|
||||
; Macros for consolidating FMA3 and FMA4 using 4-operand (dst, src1, src2, src3) syntax.
|
||||
; FMA3 is only possible if dst is the same as one of the src registers.
|
||||
; Either src2 or src3 can be a memory operand.
|
||||
%macro FMA4_INSTR 2-*
|
||||
%push fma4_instr
|
||||
%xdefine %$prefix %1
|
||||
%rep %0 - 1
|
||||
%macro %$prefix%2 4-6 %$prefix, %2
|
||||
%if notcpuflag(fma3) && notcpuflag(fma4)
|
||||
%error use of ``%5%6'' fma instruction in cpuname function: current_function
|
||||
%elif cpuflag(fma4)
|
||||
v%5%6 %1, %2, %3, %4
|
||||
%elifidn %1, %2
|
||||
; If %3 or %4 is a memory operand it needs to be encoded as the last operand.
|
||||
%ifid %3
|
||||
v%{5}213%6 %2, %3, %4
|
||||
%else
|
||||
v%{5}132%6 %2, %4, %3
|
||||
%endif
|
||||
%elifidn %1, %3
|
||||
v%{5}213%6 %3, %2, %4
|
||||
%elifidn %1, %4
|
||||
v%{5}231%6 %4, %2, %3
|
||||
%else
|
||||
%error fma3 emulation of ``%5%6 %1, %2, %3, %4'' is not supported
|
||||
%endif
|
||||
%endmacro
|
||||
%rotate 1
|
||||
%endrep
|
||||
%pop
|
||||
%endmacro
|
||||
|
||||
FMA4_INSTR fmaddpd, fmadd132pd, fmadd213pd, fmadd231pd
|
||||
FMA4_INSTR fmaddps, fmadd132ps, fmadd213ps, fmadd231ps
|
||||
FMA4_INSTR fmaddsd, fmadd132sd, fmadd213sd, fmadd231sd
|
||||
FMA4_INSTR fmaddss, fmadd132ss, fmadd213ss, fmadd231ss
|
||||
|
||||
FMA4_INSTR fmaddsubpd, fmaddsub132pd, fmaddsub213pd, fmaddsub231pd
|
||||
FMA4_INSTR fmaddsubps, fmaddsub132ps, fmaddsub213ps, fmaddsub231ps
|
||||
FMA4_INSTR fmsubaddpd, fmsubadd132pd, fmsubadd213pd, fmsubadd231pd
|
||||
FMA4_INSTR fmsubaddps, fmsubadd132ps, fmsubadd213ps, fmsubadd231ps
|
||||
|
||||
FMA4_INSTR fmsubpd, fmsub132pd, fmsub213pd, fmsub231pd
|
||||
FMA4_INSTR fmsubps, fmsub132ps, fmsub213ps, fmsub231ps
|
||||
FMA4_INSTR fmsubsd, fmsub132sd, fmsub213sd, fmsub231sd
|
||||
FMA4_INSTR fmsubss, fmsub132ss, fmsub213ss, fmsub231ss
|
||||
|
||||
FMA4_INSTR fnmaddpd, fnmadd132pd, fnmadd213pd, fnmadd231pd
|
||||
FMA4_INSTR fnmaddps, fnmadd132ps, fnmadd213ps, fnmadd231ps
|
||||
FMA4_INSTR fnmaddsd, fnmadd132sd, fnmadd213sd, fnmadd231sd
|
||||
FMA4_INSTR fnmaddss, fnmadd132ss, fnmadd213ss, fnmadd231ss
|
||||
|
||||
FMA4_INSTR fnmsubpd, fnmsub132pd, fnmsub213pd, fnmsub231pd
|
||||
FMA4_INSTR fnmsubps, fnmsub132ps, fnmsub213ps, fnmsub231ps
|
||||
FMA4_INSTR fnmsubsd, fnmsub132sd, fnmsub213sd, fnmsub231sd
|
||||
FMA4_INSTR fnmsubss, fnmsub132ss, fnmsub213ss, fnmsub231ss
|
||||
FMA4_INSTR fmadd, pd, ps, sd, ss
|
||||
FMA4_INSTR fmaddsub, pd, ps
|
||||
FMA4_INSTR fmsub, pd, ps, sd, ss
|
||||
FMA4_INSTR fmsubadd, pd, ps
|
||||
FMA4_INSTR fnmadd, pd, ps, sd, ss
|
||||
FMA4_INSTR fnmsub, pd, ps, sd, ss
|
||||
|
||||
; workaround: vpbroadcastq is broken in x86_32 due to a yasm bug (fixed in 1.3.0)
|
||||
%ifdef __YASM_VER__
|
||||
|
||||
@ -1 +0,0 @@
|
||||
#include "libavutil/x86/asm.h"
|
||||
Loading…
Reference in New Issue
Block a user