[FFmpeg-cvslog] Fix compilation with --disable-everything --enable-encoder=flac.

[Clément Bœsch]

On Sat, Feb 08, 2014 at 12:08:41PM +0100, Carl Eugen Hoyos wrote:
> ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Feb  8 12:06:49 2014 +0100| [4bcc6febcff23b4db2c135d937c6b6830657f0eb] | committer: Carl Eugen Hoyos
> 
> Fix compilation with --disable-everything --enable-encoder=flac.
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bcc6febcff23b4db2c135d937c6b6830657f0eb
> ---
> 
>  libavcodec/flacdsp.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c
> index b15bc74..89cf09a 100644
> --- a/libavcodec/flacdsp.c
> +++ b/libavcodec/flacdsp.c
> @@ -128,6 +128,6 @@ av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt,
>  
>      if (ARCH_ARM)
>          ff_flacdsp_init_arm(c, fmt, bps);
> -    if (ARCH_X86)
> +    if (ARCH_X86 && CONFIG_FLAC_DECODER)
>          ff_flacdsp_init_x86(c, fmt, bps);
>  }


Why not ARM? It's in the same situation AFAICT. Also, why not instead add
the flacdsp_init*.o to the
libavcodec/{arm,x86}/Makefile:OBJS-$(CONFIG_FLAC_ENCODER)?

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20140208/6bcb64d8/attachment.asc>