diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:31:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:31:22 +0200 |
| commit | 9e8c92226fe18a21b6605550a50b67066a6bffd9 (patch) | |
| tree | 5f834efd640c875558c4c30043a6020db624ffba | |
| parent | 738272826f4b3b060dfe2855df5ce11865df1ec7 (diff) | |
| parent | 85d805d5cccb2f57e7f2e2254d7a870f05926cfd (diff) | |
| download | ffmpeg-9e8c92226fe18a21b6605550a50b67066a6bffd9.tar.gz | |
Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'
* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd':
build: Add missing object files for webm muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 520b390270..46aac969ab 100644 --- 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 |