summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorTobias Bindhammer <tobias.bindhammer@uni-ulm.de>2010-08-23 11:52:34 +0000
committerTobias Bindhammer <tobias.bindhammer@uni-ulm.de>2010-08-23 11:52:34 +0000
commitb7cf4e4f5552cb6c55166a2d53204c5a737ecd08 (patch)
tree63139b0917548de7c6e06096a28119cd7cb94330 /libavcodec
parent40c5ee990376abc56149b218b3d0873a638b4a6a (diff)
enabling codec and muxer by registering it in allcodec.c and allformat.c and adding files to the build-system
Originally committed as revision 24878 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/allcodecs.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1422b5c279..3d0cb8ce32 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -44,6 +44,8 @@ OBJS-$(CONFIG_VAAPI) += vaapi.o
OBJS-$(CONFIG_VDPAU) += vdpau.o
# decoders/encoders/hardware accelerators
+OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o
+OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o
OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \
aacadtsdec.o mpeg4audio.o
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 83f075abb0..bf28028f55 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -66,6 +66,8 @@ void avcodec_register_all(void)
REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi);
/* video codecs */
+ REGISTER_ENCODER (A64MULTI, a64multi);
+ REGISTER_ENCODER (A64MULTI5, a64multi5);
REGISTER_DECODER (AASC, aasc);
REGISTER_DECODER (AMV, amv);
REGISTER_DECODER (ANM, anm);