diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:56:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:56:22 +0200 |
| commit | 7ed002d79136c2e24d12b432852a271b235fc3b9 (patch) | |
| tree | 93bb61e9bcc40c407ecaa828bfd2636fffee860a | |
| parent | 1dfb34db6dd0fcce78a54eb29e09fa5984da6e9a (diff) | |
| parent | 22a154e4363b351dd9f321003de01dffebd2fa18 (diff) | |
| download | ffmpeg-7ed002d79136c2e24d12b432852a271b235fc3b9.tar.gz | |
Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'
* commit '22a154e4363b351dd9f321003de01dffebd2fa18':
build: Add missing img2.o dependency to apetag.o
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index cc4a4cb71f..db1ac2493f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -404,7 +404,7 @@ OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv.o asfdec.o asf.o asfcry avlanguage.o mpegts.o isom.o OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv.o asf.o asfenc.o OBJS-$(CONFIG_WV_DEMUXER) += wvdec.o wv.o apetag.o img2.o -OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o +OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o |