diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2009-07-24 21:28:44 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-07-24 21:28:44 +0000 |
commit | 84c04e25196a59694abec3ae17af476994bc5ce8 (patch) | |
tree | 53f71f2f0e8661ba82c6e4c6621cacf89d302eed /libavformat | |
parent | 23251d751b2ea5313106a49d2d47589d2f2847eb (diff) | |
download | ffmpeg-84c04e25196a59694abec3ae17af476994bc5ce8.tar.gz |
fix various compilation dependencies
Originally committed as revision 19507 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index f95b426659..1447eeb14c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -52,7 +52,7 @@ OBJS-$(CONFIG_EAC3_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_EAC3_MUXER) += raw.o OBJS-$(CONFIG_FFM_DEMUXER) += ffmdec.o OBJS-$(CONFIG_FFM_MUXER) += ffmenc.o -OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o raw.o id3v2.o oggparsevorbis.o +OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o raw.o id3v1.o id3v2.o oggparsevorbis.o OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o @@ -92,10 +92,10 @@ OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o riff.o isom.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o -OBJS-$(CONFIG_MP2_MUXER) += mp3.o +OBJS-$(CONFIG_MP2_MUXER) += mp3.o id3v1.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o id3v1.o id3v2.o -OBJS-$(CONFIG_MP3_MUXER) += mp3.o -OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o id3v2.o +OBJS-$(CONFIG_MP3_MUXER) += mp3.o id3v1.o +OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o id3v1.o id3v2.o OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpegenc.o @@ -197,7 +197,7 @@ OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o OBJS-$(CONFIG_SOL_DEMUXER) += sol.o raw.o -OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o +OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o raw.o OBJS-$(CONFIG_SOX_MUXER) += soxenc.o OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o |