aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Voroshilov <voroshil@gmail.com>2008-09-03 15:18:40 +0700
committerMichael Niedermayer <michaelni@gmx.at>2011-09-24 21:11:01 +0200
commit5df643c5dfcb830a9cb1bfc81d221b7b2f01294a (patch)
treec70ca4ecc792c6d45f6ca055912c2ebb9e1a83f4
parentfb98b712611cfa45c61780cd8c0e4855630cb2a3 (diff)
downloadffmpeg-5df643c5dfcb830a9cb1bfc81d221b7b2f01294a.tar.gz
G.729 .bit file demuxer
-rw-r--r--libavformat/Makefile2
-rw-r--r--libavformat/allformats.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 6fdc6373dc..04e995fc07 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -49,6 +49,8 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o
OBJS-$(CONFIG_BINK_DEMUXER) += bink.o
OBJS-$(CONFIG_BINTEXT_DEMUXER) += bintext.o sauce.o
+OBJS-$(CONFIG_BIT_DEMUXER) += bit.o
+OBJS-$(CONFIG_BIT_MUXER) += bit.o
OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o
OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o riff.o isom.o
OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o isom.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 84cbb38e90..429ccc51fa 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -73,6 +73,7 @@ void av_register_all(void)
REGISTER_DEMUXER (BFI, bfi);
REGISTER_DEMUXER (BINTEXT, bintext);
REGISTER_DEMUXER (BINK, bink);
+ REGISTER_MUXDEMUX (BIT, bit);
REGISTER_DEMUXER (C93, c93);
REGISTER_MUXDEMUX (CAF, caf);
REGISTER_MUXDEMUX (CAVSVIDEO, cavsvideo);