diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 10:12:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 10:12:46 +0200 |
| commit | a18bf95a8ec4cc2459aa3860e99f2945d7976835 (patch) | |
| tree | a0431098ef57b1f8e6f768bb4622695489a21bf8 | |
| parent | f97e28ebe5233f6520b161ab8dbbe937dda46dc3 (diff) | |
| parent | 2681924b0f3f35840dd9d9825df9f9239c448b22 (diff) | |
| download | ffmpeg-a18bf95a8ec4cc2459aa3860e99f2945d7976835.tar.gz | |
Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'
* commit '2681924b0f3f35840dd9d9825df9f9239c448b22':
libavformat: Fix standalone compilation of the webm muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index ee592a8e7f..5438b483d3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -391,7 +391,7 @@ 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 + flacenc_header.o avlanguage.o wv.o OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o |