[FFmpeg-cvslog] r25378 - in trunk/libavformat: aacdec.c flacdec.c mp3.c mpc.c tta.c utils.c

[Martin Storsjö]

On Thu, 7 Oct 2010, Martin Storsj? wrote:

> On Wed, 6 Oct 2010, reimar wrote:
> 
> > Author: reimar
> > Date: Wed Oct  6 22:21:07 2010
> > New Revision: 25378
> > 
> > Log:
> > Move handling of ID3v2 to common utils.c code, reducing code duplication
> > and supporting it for more formats, fixing issue 2258.
> 
> This broke compilation of libavformat if none of the demuxers including 
> id3v2.o is enabled. To reproduce, configure e.g. with 
> --disable-everything.
> 
> Is this an appropriate fix?
> 
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 45bf097..7cc15e8 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -7,6 +7,7 @@ HEADERS = avformat.h avio.h
>  
>  OBJS = allformats.o         \
>         cutils.o             \
> +       id3v2.o              \
>         metadata.o           \
>         metadata_compat.o    \
>         options.o            \

Replying to myself - id3v1.o seems to be necessary, too. And if they're 
added to the list of unconditionally compiled objects, they can be removed 
from the other lists below.

// Martin