[Mplayer-cvslog] CVS: main/libmpcodecs ad_faad.c,1.9,1.10

[Dominik 'Rathann' Mierzejewski]

Hi.

Sorry for replying to such an old change, but...

On Sunday, 31 August 2003, Arpi of Ize wrote:
[...]
> Modified Files:
> 	ad_faad.c 
> Log Message:
> use internal (included) libfaad2
> 
> 
> Index: ad_faad.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_faad.c,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- ad_faad.c	7 Feb 2003 21:04:35 -0000	1.9
> +++ ad_faad.c	30 Aug 2003 22:31:45 -0000	1.10
> @@ -24,7 +24,8 @@
>  
>  LIBAD_EXTERN(faad)
>  
> -#include <faad.h>
> +//#include <faad.h>
> +#include "../libfaad2/faad.h"
>  
>  /* configure maximum supported channels, *
>   * this is theoretically max. 64 chans   */

This breaks building with external faad2-1.1. A solution would be
to leave <faad.h> and add -I../libfaad2 to gcc flags. Or introduce
an #ifdef _EXTERNAL_FAAD or something.

-- 
MPlayer RPMs maintainer: http://www.piorunek.pl/~dominik/linux/pkgs/mplayer/
"The Universe doesn't give you any points for doing things that are easy."
        -- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"