[vlc-devel] [PATCH] build system: add conditional variables to differenciate between iOS and OS X

[Felix Paul Kühne]

Hey David,

On 06.03.2014, at 15:04, David Fuhrmann <david.fuhrmann at gmail.com> wrote:

> Am 06.03.2014 um 13:20 schrieb Felix Paul Kühne <fkuehne at videolan.org>:
> 
>> 
>> libaudioqueue_plugin_la_SOURCES = audio_output/audioqueue.c
>> libaudioqueue_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices -rpath '$(aoutdir)'
>> -EXTRA_LTLIBRARIES += libauhal_plugin.la libaudiounit_ios_plugin.la libaudioqueue_plugin.la
>> -aout_LTLIBRARIES += $(LTLIBauhal) $(LTLIBaudiounit_ios) $(LTLIBaudioqueue)
>> +EXTRA_LTLIBRARIES += libaudioqueue_plugin.la
> 
> Why is audioqueue removed from aout_LTLIBRARIES, but left in for EXTRA_LTLIBRARIES? I'm not sure for what its used for, you still left the Configure.ac checks in for this module.

I kept the option because this is an optional module, which is not used by default in either the iOS or the OS X builds. However, it can run on both. We might think about removing it actually. Same applies to the Core Graphics vout.

>> diff --git a/modules/codec/avcodec/vda.c b/modules/codec/avcodec/vda.c
>> index 3c31250..85a94c5 100644
>> --- a/modules/codec/avcodec/vda.c
>> +++ b/modules/codec/avcodec/vda.c
>> @@ -161,7 +161,6 @@ static int Setup( vlc_va_t *external, void **pp_hw_ctx, vlc_fourcc_t *pi_chroma,
>> 
>>    memset( &p_va->hw_ctx, 0, sizeof(p_va->hw_ctx) );
>>    p_va->hw_ctx.format = 'avc1';
>> -    p_va->hw_ctx.use_ref_buffer = 1;
> 
> Unrelated change. :-)

Dropped from committed patch.

Cheers,

Felix