ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Tue Feb 24 11:22:47 2015 +0100| [cc69ccb6d44042b1f795da66306116b0964af996] | committer: Clément Bœsch
avformat/nutdec: fix isom and mpa build deps Fixes the following link error: nutdec.c:(.text+0x2d47): undefined reference to `ff_codec_movvideo_tags' isom.c:(.text+0x332): undefined reference to `avpriv_mpeg4audio_get_config' isom.c:(.text+0x39e): undefined reference to `avpriv_mpa_freq_tab' > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc69ccb6d44042b1f795da66306116b0964af996 --- libavcodec/Makefile | 1 + libavformat/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 27b70bd..a4204d8 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -709,6 +709,7 @@ OBJS-$(CONFIG_MPEGTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_MXF_MUXER) += dnxhddata.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o +OBJS-$(CONFIG_NUT_DEMUXER) += mpegaudiodata.o mpeg4audio.o OBJS-$(CONFIG_OGA_MUXER) += flac.o flacdata.o OBJS-$(CONFIG_OGG_DEMUXER) += mpeg12data.o \ dirac.o vorbis_data.o diff --git a/libavformat/Makefile b/libavformat/Makefile index 2817be3..4cc300f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -283,7 +283,7 @@ OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o OBJS-$(CONFIG_NISTSPHERE_DEMUXER) += nistspheredec.o pcm.o OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o OBJS-$(CONFIG_NULL_MUXER) += nullenc.o -OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o +OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o isom.o OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
