diff options
| author | Tobias Bindhammer <tobias.bindhammer@uni-ulm.de> | 2010-08-23 11:52:34 +0000 |
|---|---|---|
| committer | Tobias Bindhammer <tobias.bindhammer@uni-ulm.de> | 2010-08-23 11:52:34 +0000 |
| commit | b7cf4e4f5552cb6c55166a2d53204c5a737ecd08 (patch) | |
| tree | 63139b0917548de7c6e06096a28119cd7cb94330 | |
| parent | 40c5ee990376abc56149b218b3d0873a638b4a6a (diff) | |
| download | ffmpeg-b7cf4e4f5552cb6c55166a2d53204c5a737ecd08.tar.gz | |
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
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 |
4 files changed, 6 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); diff --git a/libavformat/Makefile b/libavformat/Makefile index ab260a1bc5..5c1aaac8f8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -16,6 +16,7 @@ OBJS = allformats.o \ utils.o \ # muxers/demuxers +OBJS-$(CONFIG_A64_MUXER) += a64.o OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o OBJS-$(CONFIG_AC3_DEMUXER) += raw.o OBJS-$(CONFIG_AC3_MUXER) += raw.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 03702c3152..6e73e825e2 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -47,6 +47,7 @@ void av_register_all(void) avcodec_register_all(); /* (de)muxers */ + REGISTER_MUXER (A64, a64); REGISTER_DEMUXER (AAC, aac); REGISTER_MUXDEMUX (AC3, ac3); REGISTER_MUXER (ADTS, adts); |