Re: [libav-devel] [PATCH 5/9] build: Fix dependencies after splitting of flacdsp from flacdec

[Måns Rullgård]

Diego Biurrun <di...@biurrun.de> writes:

> ---
>  libavcodec/Makefile |   19 ++++++++++++-------
>  1 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 7b475b0..5c7163d 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -586,19 +586,22 @@ OBJS-$(CONFIG_ADX_DEMUXER)             += adx.o
>  OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
>  OBJS-$(CONFIG_DV_DEMUXER)              += dv_profile.o
>  OBJS-$(CONFIG_DV_MUXER)                += dv_profile.o
> -OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.o flacdata.o flac.o
> -OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.o flacdata.o flac.o
> +OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.o flacdata.o flac.o   \
> +                                          flacdsp.o
> +OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.o flacdata.o flac.o   \
> +                                          flacdsp.o
>  OBJS-$(CONFIG_FLV_DEMUXER)             += mpeg4audio.o
>  OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
>  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o
>  OBJS-$(CONFIG_ISMV_MUXER)              += mpeg4audio.o mpegaudiodata.o
>  OBJS-$(CONFIG_LATM_MUXER)              += mpeg4audio.o
>  OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o           \
> -                                          flacdec.o flacdata.o flac.o
> +                                          flacdec.o flacdata.o flac.o   \
> +                                          flacdsp.o
>  OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o mpegaudiodata.o
>  OBJS-$(CONFIG_MATROSKA_MUXER)          += xiph.o mpeg4audio.o           \
>                                            flacdec.o flacdata.o flac.o   \
> -                                          mpegaudiodata.o
> +                                          flacdsp.o mpegaudiodata.o
>  OBJS-$(CONFIG_MP3_MUXER)               += mpegaudiodata.o 
> mpegaudiodecheader.o
>  OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o 
> ac3tab.o
>  OBJS-$(CONFIG_MOV_MUXER)               += mpeg4audio.o mpegaudiodata.o
> @@ -606,13 +609,15 @@ OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o 
> mpeg4audio.o
>  OBJS-$(CONFIG_MPEGTS_DEMUXER)          += mpeg4audio.o mpegaudiodata.o
>  OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
>  OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.o flacdata.o flac.o   \
> -                                          dirac.o mpeg12data.o 
> vorbis_parser.o
> -OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flacdec.o flacdata.o flac.o
> +                                          flacdsp.o mpeg12data.o        \
> +                                          dirac.o vorbis_parser.o
> +OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flacdec.o flacdata.o   \
> +                                          flac.o flacdsp.o
>  OBJS-$(CONFIG_RTP_MUXER)               += mpeg4audio.o mpegvideo.o xiph.o
>  OBJS-$(CONFIG_SPDIF_DEMUXER)           += aacadtsdec.o mpeg4audio.o
>  OBJS-$(CONFIG_WEBM_MUXER)              += xiph.o mpeg4audio.o           \
>                                            flacdec.o flacdata.o flac.o   \
> -                                          mpegaudiodata.o
> +                                          flacdsp.o mpegaudiodata.o
>  OBJS-$(CONFIG_WTV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
>
>  # external codec libraries
> -- 

Wrong.  Please move the functions needed by these demuxers to a file
other than flacdec.c.

-- 
Måns Rullgård
m...@mansr.com
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel