diff options
| author | Michael Forney <mforney@mforney.org> | 2020-08-18 20:34:38 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-08-19 12:43:47 -0700 |
| commit | df8017a9dca4da4f97c2bab137e504a3bea89ffa (patch) | |
| tree | 52aead1c3f1bcd5b7466f98f7e98990211f0dd81 /pkg | |
| parent | 7508d43375d83dd388006cc627705bad2df14ee8 (diff) | |
ffmpeg: Enable AV1 decoding through dav1d
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/ffmpeg/gen.lua | 6 | ||||
| -rw-r--r-- | pkg/ffmpeg/options.h | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua index 72370562..6919ef9e 100644 --- a/pkg/ffmpeg/gen.lua +++ b/pkg/ffmpeg/gen.lua @@ -104,6 +104,12 @@ if options.CONFIG_ALSA_INDEV or options.config_ALSA_OUTDEV then table.insert(sources.libavdevice, '$builddir/pkg/alsa-lib/libasound.a') end +if options.CONFIG_LIBDAV1D_DECODER then + cflags{'-isystem $builddir/pkg/dav1d/include'} + table.insert(pkg.deps, 'pkg/dav1d/headers') + table.insert(sources.libavcodec, '$builddir/pkg/dav1d/libdav1d.a') +end + if options.CONFIG_TLS_PROTOCOL and options.CONFIG_LIBTLS then cflags{'-isystem $builddir/pkg/libtls-bearssl/include'} table.insert(pkg.deps, 'pkg/libtls-bearssl/headers') diff --git a/pkg/ffmpeg/options.h b/pkg/ffmpeg/options.h index 6c3724b1..54feacbc 100644 --- a/pkg/ffmpeg/options.h +++ b/pkg/ffmpeg/options.h @@ -433,7 +433,7 @@ #define CONFIG_LIBCACA 0 #define CONFIG_LIBCELT 0 #define CONFIG_LIBCODEC2 0 -#define CONFIG_LIBDAV1D 0 +#define CONFIG_LIBDAV1D 1 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDRM 0 #define CONFIG_LIBFLITE 0 @@ -596,8 +596,8 @@ #define CONFIG_BLOCKDSP 1 #define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 -#define CONFIG_CBS 0 -#define CONFIG_CBS_AV1 0 +#define CONFIG_CBS 1 +#define CONFIG_CBS_AV1 1 #define CONFIG_CBS_H264 0 #define CONFIG_CBS_H265 0 #define CONFIG_CBS_JPEG 0 @@ -1212,7 +1212,7 @@ #define CONFIG_LIBARIBB24_DECODER 0 #define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCODEC2_DECODER 0 -#define CONFIG_LIBDAV1D_DECODER 0 +#define CONFIG_LIBDAV1D_DECODER 1 #define CONFIG_LIBDAVS2_DECODER 0 #define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 @@ -1531,7 +1531,7 @@ #define CONFIG_AAC_LATM_PARSER 0 #define CONFIG_AC3_PARSER 1 #define CONFIG_ADX_PARSER 0 -#define CONFIG_AV1_PARSER 0 +#define CONFIG_AV1_PARSER 1 #define CONFIG_AVS2_PARSER 0 #define CONFIG_BMP_PARSER 0 #define CONFIG_CAVSVIDEO_PARSER 0 @@ -2188,7 +2188,7 @@ #define CONFIG_IRCAM_DEMUXER 0 #define CONFIG_ISS_DEMUXER 0 #define CONFIG_IV8_DEMUXER 0 -#define CONFIG_IVF_DEMUXER 0 +#define CONFIG_IVF_DEMUXER 1 #define CONFIG_IVR_DEMUXER 0 #define CONFIG_JACOSUB_DEMUXER 0 #define CONFIG_JV_DEMUXER 0 |