diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:46:10 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:46:10 +0000 |
| commit | 34e4c588c8e86fc407f8a67942434949f51b7da6 (patch) | |
| tree | fba7ed12afa96dab869b7ee739d03522a1210677 /libavformat | |
| parent | 3c5a040ad94d0758e5b8949b049926f172812ef2 (diff) | |
| parent | 82454c3a826bc8aa42474097784b70befd5be532 (diff) | |
| download | ffmpeg-34e4c588c8e86fc407f8a67942434949f51b7da6.tar.gz | |
Merge commit '82454c3a826bc8aa42474097784b70befd5be532'
* commit '82454c3a826bc8aa42474097784b70befd5be532':
build: Let the WTV demuxer select the MPEG-TS demuxer
build: Adjust mpeg4video parser dependencies
build: Fix mpegvideo component dependencies
build: Fix dependencies for components relying on H.263 data tables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index b98c1a3805..219140fd41 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -484,9 +484,9 @@ OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asf.o \ - avlanguage.o mpegts.o isom.o + avlanguage.o OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv_common.o \ - mpegtsenc.o asf.o + asf.o OBJS-$(CONFIG_WV_DEMUXER) += wvdec.o wv.o apetag.o img2.o OBJS-$(CONFIG_WVE_DEMUXER) += wvedec.o pcm.o OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o |