[FFmpeg-devel] patch for libdc1394.c

[Måns Rullgård]

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,
> I think the other is fine.
>
> Index: configure
> ===================================================================
> --- configure	(revisione 11430)
> +++ configure	(copia locale)
> @@ -1633,7 +1633,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 +1647,24 @@
>  # disable the native AC-3 decoder if liba52 is enabled
>  enabled liba52 && disable ac3_decoder
>  
> +# if libdc1394 is enabled, check for both
> +# - libdc1394 version 1
> +# - libdc1394 version 2
> +# and prefer the second one if present
> +if enabled libdc1394; then
> +    check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 && enable libdc1394_2
> +else
> +    check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 && enable libdc1394_1
> +fi
> +# die if libdc1934 is enabled but none version of libdc1394 is found
> +{ disabled libdc1394; } ||
> +{ enabled libdc1394 &&
> +  enabled libdc1394_1; } ||
> +{ enabled libdc1394 && 
> +  enabled libdc1394_2; } ||
> +die "ERROR: No version of libdc1394 found "
> +
> +
>  _restrict=
>  for restrict_keyword in restrict __restrict__ __restrict; do
>      check_cc <<EOF && _restrict=$restrict_keyword && break

This doesn't make any sense.  Perhaps it's still late.

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