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

[James Darnley]

On 2014-02-08 12:23, Clément Bœsch wrote:
> On Sat, Feb 08, 2014 at 12:08:41PM +0100, Carl Eugen Hoyos wrote:
>> 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)?

Regarding this, the init files currently have a dependency on the
assembly for the decoder and soon for the encoder too.  If my patches
for x86 get approved I will want to remove that CONFIG_FLAC_DECODER just
added.

This could be fixed by making both the encoder and decoder depend on all
the dsp parts.

Alternatively I could fix it with some #if conditions so that only the
decoder parts are used if it is enabled and vice versa.  Another option
for this is to use the CONFIG_FLAC_* defines in the if() conditions.
This way only the appropriate dependencies need be specified.

Thoughts?  Comments?

P.S.  I also addressed this to ffmpeg-devel if the conversation should
be continued there.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 683 bytes
Desc: OpenPGP digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20140208/a413bb52/attachment.asc>