Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'

* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd': build: Add missing object files for webm muxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 9e8c92226f
parent 738272826f 85d805d5cc
commit 9e8c92226f
1 changed files with 3 additions and 2 deletions
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@ -419,8 +419,9 @@ OBJS-$(CONFIG_WAV_DEMUXER)               += wavdec.o pcm.o
 OBJS-$(CONFIG_WAV_MUXER)                 += wavenc.o
 OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.o
 OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
-                                            isom.o avc.o \
-                                            flacenc_header.o avlanguage.o wv.o
+                                            isom.o avc.o hevc.o \
+                                            flacenc_header.o avlanguage.o \
+                                            wv.o vorbiscomment.o
 OBJS-$(CONFIG_WEBVTT_DEMUXER)            += webvttdec.o subtitles.o
 OBJS-$(CONFIG_WEBVTT_MUXER)              += webvttenc.o
 OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood_aud.o