diff options
| author | James Almer <jamrial@gmail.com> | 2018-03-28 23:15:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-03-29 00:05:45 -0300 |
| commit | 99cc3cf7a26cd4113e5047034577027d8c6f07a2 (patch) | |
| tree | 5d92c63f0bceae9ab148141de6acbe372c1a847a /libavcodec/Makefile | |
| parent | d039d7d4a4a56861e210761902bcf0617e0800fa (diff) | |
| parent | 43778a501f1bfbceeddc8eaeea2ea2b3506beeda (diff) | |
| download | ffmpeg-99cc3cf7a26cd4113e5047034577027d8c6f07a2.tar.gz | |
Merge commit '43778a501f1bfbceeddc8eaeea2ea2b3506beeda'
* commit '43778a501f1bfbceeddc8eaeea2ea2b3506beeda':
Support AV1 encoding using libaom
This contains some extra changes taken from the libvpx encoder
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 127f53596a..404047d335 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -940,6 +940,7 @@ 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_LIBAOM_AV1_ENCODER) += libaomenc.o OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o codec2utils.o OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o codec2utils.o |