Originally committed as revision 24878 to svn://svn.ffmpeg.org/ffmpeg/trunktags/n0.8
@@ -44,6 +44,8 @@ OBJS-$(CONFIG_VAAPI) += vaapi.o | |||||
OBJS-$(CONFIG_VDPAU) += vdpau.o | OBJS-$(CONFIG_VDPAU) += vdpau.o | ||||
# decoders/encoders/hardware accelerators | # 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 \ | OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \ | ||||
aacadtsdec.o mpeg4audio.o | aacadtsdec.o mpeg4audio.o | ||||
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ | OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ | ||||
@@ -66,6 +66,8 @@ void avcodec_register_all(void) | |||||
REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi); | REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi); | ||||
/* video codecs */ | /* video codecs */ | ||||
REGISTER_ENCODER (A64MULTI, a64multi); | |||||
REGISTER_ENCODER (A64MULTI5, a64multi5); | |||||
REGISTER_DECODER (AASC, aasc); | REGISTER_DECODER (AASC, aasc); | ||||
REGISTER_DECODER (AMV, amv); | REGISTER_DECODER (AMV, amv); | ||||
REGISTER_DECODER (ANM, anm); | REGISTER_DECODER (ANM, anm); | ||||
@@ -16,6 +16,7 @@ OBJS = allformats.o \ | |||||
utils.o \ | utils.o \ | ||||
# muxers/demuxers | # muxers/demuxers | ||||
OBJS-$(CONFIG_A64_MUXER) += a64.o | |||||
OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o | OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o | ||||
OBJS-$(CONFIG_AC3_DEMUXER) += raw.o | OBJS-$(CONFIG_AC3_DEMUXER) += raw.o | ||||
OBJS-$(CONFIG_AC3_MUXER) += raw.o | OBJS-$(CONFIG_AC3_MUXER) += raw.o | ||||
@@ -47,6 +47,7 @@ void av_register_all(void) | |||||
avcodec_register_all(); | avcodec_register_all(); | ||||
/* (de)muxers */ | /* (de)muxers */ | ||||
REGISTER_MUXER (A64, a64); | |||||
REGISTER_DEMUXER (AAC, aac); | REGISTER_DEMUXER (AAC, aac); | ||||
REGISTER_MUXDEMUX (AC3, ac3); | REGISTER_MUXDEMUX (AC3, ac3); | ||||
REGISTER_MUXER (ADTS, adts); | REGISTER_MUXER (ADTS, adts); | ||||