[FFmpeg-cvslog] r20326 - trunk/libavformat/Makefile

[Diego Biurrun]

On Mon, Oct 19, 2009 at 06:53:38PM -0400, Justin Ruggles wrote:
> diego wrote:
> 
> > Log:
> > The MP2/MP3 muxer uses ff_id3v2_tags, so add the correct object dependency.
> > 
> > --- trunk/libavformat/Makefile	Tue Oct 20 00:26:52 2009	(r20325)
> > +++ trunk/libavformat/Makefile	Tue Oct 20 00:32:32 2009	(r20326)
> > @@ -106,9 +106,9 @@ OBJS-$(CONFIG_MMF_DEMUXER)              
> >  OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o riff.o isom.o avc.o
> > -OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o id3v1.o
> > +OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o id3v1.o id3v2.o
> >  OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o id3v1.o id3v2.o
> > -OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o id3v1.o
> > +OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o id3v1.o id3v2.o
> 
> From what I can see, the MP2 muxer does not use id3v2 at all, only id3v1.

ff_id3v2_tags is used in a function that is compiled conditional to
CONFIG_MP2_MUXER, namely mp3_write_header.  I moved the function below
the MP3_MUXER-only #if, this seems like the best solution.

Diego