[FFmpeg-devel] patch for libdc1394.c

[Måns Rullgård]

Alessandro Sappia <a.sappia at ngi.it> writes:

> M?ns Rullg?rd ha scritto:
>> Alessandro Sappia <a.sappia at ngi.it> writes:
>>
>>   
>>> M?ns Rullg?rd ha scritto:
>>>     
>>>> Alessandro Sappia <a.sappia at ngi.it> writes:
>>>>
>>>>   
>>>>       
>>>>> M?ns Rullg?rd ha scritto:
>>>>>     
>>>>>         
>>>>>> Please resend without random whitespace changes.  This is impossible
>>>>>> to review properly.
>>>>>>
>>>>>>   
>>>>>>       
>>>>>>           
>>>>> Sorry, I got it late ^^
>>>>>
>>>>> attached the new configure patch,

[...]

>>
>> This makes more sense (and doesn't do at all the same thing as the
>> last version), but it's still incomplete.  You need to add
>> libdc1394_1/2 to HAVE_LIST or those symbols will not be #defined.
>>
>>   
> you're right ^^, I miss it because in the libdc1394.c I used #ifndef and
> not #ifdef
>
> here you are :-P
>
> Alessandro
>
> Index: configure
> ===================================================================
> --- configure	(revisione 11430)
> +++ configure	(copia locale)
> @@ -747,6 +747,8 @@
>      termios_h
>      threads
>      winsock2_h
> +    libdc1394_1
> +    libdc1394_2
>  "

Alphabetical order, please.

>  CMDLINE_SELECT="
> @@ -1633,7 +1635,6 @@
>  enabled liba52     && require  liba52 a52dec/a52.h a52_init -la52
>  enabled libamr_nb  && require  libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
>  enabled libamr_wb  && require  libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
> -enabled libdc1394  && require  libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
>  enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
>  enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
>  enabled libgsm     && require  libgsm gsm.h gsm_create -lgsm
> @@ -1648,6 +1649,14 @@
>  # disable the native AC-3 decoder if liba52 is enabled
>  enabled liba52 && disable ac3_decoder
>  
> +# libdc1394 check
> +if enabled libdc1394; then
> +    { check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 && enable libdc1394_2; } ||
> +    { check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 && enable libdc1394_1; } ||
> +    die "ERROR: No version of libdc1394 found "
> +fi

Perhaps a little creative line breaking would be appropriate here.
Otherwise it should be OK once the code patch has been sorted out.

-- 
M?ns Rullg?rd
mans at mansr.com