diff options
| author | James Almer <jamrial@gmail.com> | 2018-03-28 18:09:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-03-28 18:09:46 -0300 |
| commit | 0dc11d8bbd470db89fbc17b7434e992c9129b310 (patch) | |
| tree | 69d0953ef70a799c5f32302ed6958a0c392f3389 /libavcodec/Makefile | |
| parent | cbd5e737fee5e64109fffbc5c2dc05024a06c2c6 (diff) | |
| parent | c438899a706422b8362a13714580e988be4d638b (diff) | |
| download | ffmpeg-0dc11d8bbd470db89fbc17b7434e992c9129b310.tar.gz | |
Merge commit 'c438899a706422b8362a13714580e988be4d638b'
* commit 'c438899a706422b8362a13714580e988be4d638b':
Add AV1 video decoding support through libaom
This contains some extra changes taken from the libvpx decoder
wrapper, most of them contained in the set_pix_fmt() function.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index aaef6c3ab8..127f53596a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -939,6 +939,7 @@ OBJS-$(CONFIG_ALAC_AT_ENCODER) += audiotoolboxenc.o OBJS-$(CONFIG_ILBC_AT_ENCODER) += audiotoolboxenc.o OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER) += audiotoolboxenc.o OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER) += audiotoolboxenc.o +OBJS-$(CONFIG_LIBAOM_AV1_DECODER) += libaomdec.o OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o codec2utils.o OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o codec2utils.o |