Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:56:14 +0000 (14:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:56:22 +0000 (14:56 +0200)
* commit '22a154e4363b351dd9f321003de01dffebd2fa18':
  build: Add missing img2.o dependency to apetag.o

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/Makefile

@@@ -396,17 -332,13 +396,17 @@@ OBJS-$(CONFIG_WC3_DEMUXER
  OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
                                              isom.o avc.o \
                                              flacenc_header.o avlanguage.o wv.o
 +OBJS-$(CONFIG_WEBVTT_DEMUXER)            += webvttdec.o subtitles.o
 +OBJS-$(CONFIG_WEBVTT_MUXER)              += webvttenc.o
  OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood_aud.o
  OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood_vqa.o
 -OBJS-$(CONFIG_WTV_DEMUXER)               += wtv.o asfdec.o asf.o asfcrypt.o \
 +OBJS-$(CONFIG_WTV_DEMUXER)               += wtvdec.o wtv.o asfdec.o asf.o asfcrypt.o \
                                              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
  OBJS-$(CONFIG_XWMA_DEMUXER)              += xwma.o
  OBJS-$(CONFIG_YOP_DEMUXER)               += yop.o