diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 13:05:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 13:36:54 +0200 |
commit | 30b8f3e7dcd0318b91e205dcbf774ef92fb6193c (patch) | |
tree | 151ff7f81b2be847087918a769a2f596a5f0bb9c /libavformat/Makefile | |
parent | da0616985095202434a4dfd30eb2ea09e3a57938 (diff) | |
parent | b08569a23948db107e5e6175cd4c695427d5339d (diff) | |
download | ffmpeg-30b8f3e7dcd0318b91e205dcbf774ef92fb6193c.tar.gz |
Merge commit 'b08569a23948db107e5e6175cd4c695427d5339d'
* commit 'b08569a23948db107e5e6175cd4c695427d5339d':
lavf: Replace the ASF demuxer
Conflicts:
Changelog
libavformat/asf.h
libavformat/asfdec.c
libavformat/version.h
tests/ref/fate/wmv8-drm-nodec
tests/ref/seek/lavf-asf
The rewritten demuxer is placed in a new file, the current demuxer is
left as default. Carl has tested both and the one working better is
default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
-rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 5380a2ad45..17e2214d79 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -84,6 +84,8 @@ OBJS-$(CONFIG_APNG_MUXER) += apngenc.o OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \ avlanguage.o +OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec-o.o asf.o asfcrypt.o \ + avlanguage.o OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o subtitles.o OBJS-$(CONFIG_ASS_MUXER) += assenc.o |