Originally committed as revision 24878 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -44,6 +44,8 @@ OBJS-$(CONFIG_VAAPI) += vaapi.o · 43 unmodified lines | |||
| 44 | OBJS-$(CONFIG_VDPAU) += vdpau.o | 44 | OBJS-$(CONFIG_VDPAU) += vdpau.o |
| 45 | 45 | ||
| 46 | # decoders/encoders/hardware accelerators | 46 | # decoders/encoders/hardware accelerators |
| 47 | OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o | ||
| 48 | OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o | ||
| 47 | OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \ | 49 | OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \ |
| 48 | aacadtsdec.o mpeg4audio.o | 50 | aacadtsdec.o mpeg4audio.o |
| 49 | OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ | 51 | OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ |
| @@ -66,6 +66,8 @@ void avcodec_register_all(void) · 65 unmodified lines | |||
| 66 | REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi); | 66 | REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi); |
| 67 | 67 | ||
| 68 | /* video codecs */ | 68 | /* video codecs */ |
| 69 | REGISTER_ENCODER (A64MULTI, a64multi); | ||
| 70 | REGISTER_ENCODER (A64MULTI5, a64multi5); | ||
| 69 | REGISTER_DECODER (AASC, aasc); | 71 | REGISTER_DECODER (AASC, aasc); |
| 70 | REGISTER_DECODER (AMV, amv); | 72 | REGISTER_DECODER (AMV, amv); |
| 71 | REGISTER_DECODER (ANM, anm); | 73 | REGISTER_DECODER (ANM, anm); |
| @@ -16,6 +16,7 @@ OBJS = allformats.o \ · 15 unmodified lines | |||
| 16 | utils.o \ | 16 | utils.o \ |
| 17 | 17 | ||
| 18 | # muxers/demuxers | 18 | # muxers/demuxers |
| 19 | OBJS-$(CONFIG_A64_MUXER) += a64.o | ||
| 19 | OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o | 20 | OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o |
| 20 | OBJS-$(CONFIG_AC3_DEMUXER) += raw.o | 21 | OBJS-$(CONFIG_AC3_DEMUXER) += raw.o |
| 21 | OBJS-$(CONFIG_AC3_MUXER) += raw.o | 22 | OBJS-$(CONFIG_AC3_MUXER) += raw.o |
| @@ -47,6 +47,7 @@ void av_register_all(void) · 46 unmodified lines | |||
| 47 | avcodec_register_all(); | 47 | avcodec_register_all(); |
| 48 | 48 | ||
| 49 | /* (de)muxers */ | 49 | /* (de)muxers */ |
| 50 | REGISTER_MUXER (A64, a64); | ||
| 50 | REGISTER_DEMUXER (AAC, aac); | 51 | REGISTER_DEMUXER (AAC, aac); |
| 51 | REGISTER_MUXDEMUX (AC3, ac3); | 52 | REGISTER_MUXDEMUX (AC3, ac3); |
| 52 | REGISTER_MUXER (ADTS, adts); | 53 | REGISTER_MUXER (ADTS, adts); |