[MPlayer-cvslog] r23658 - in trunk: libmpcodecs/ad_hwac3.c libmpcodecs/ad_liba52.c mpbswap.h

[Roberto Togni]

On Sun, 24 Jun 2007 17:25:32 +0200 (CEST)
reimar <subversion at mplayerhq.hu> wrote:

> Author: reimar
> Date: Sun Jun 24 17:25:32 2007
> New Revision: 23658
> 
> Log:
> Make sure we always have a swab() prototype when we use it,
> even if we use our osdep/swab.c emulation
> 
> 
> Modified:
>    trunk/libmpcodecs/ad_hwac3.c
>    trunk/libmpcodecs/ad_liba52.c
>    trunk/mpbswap.h
> 

[...]

> Modified: trunk/mpbswap.h
> ==============================================================================
> --- trunk/mpbswap.h	(original)
> +++ trunk/mpbswap.h	Sun Jun 24 17:25:32 2007
> @@ -2,5 +2,6 @@
>  #define MPBSWAP_H
>  
>  #include "libavutil/bswap.h"
> +void swab(const void *from, void *to, ssize_t n);
>  
>  #endif /* MPBSWAP_H */

This breaks compilation of demux_rtp.cpp

cc -I. -I.. -I../libavutil -W -Wall -O2 -march=pentium4 -mtune=pentium4
-pipe -g  -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-D_LARGEFILE64_SOURCE -D__STDC_LIMIT_MACROS -I/usr/include/directfb
-I/usr/include -I/usr/include/  -I/usr/include/SDL  -D_REENTRANT
-I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include  -I/usr/include/freetype2
-I/usr/local/lib/live/liveMedia/include
-I/usr/local/lib/live/UsageEnvironment/include
-I/usr/local/lib/live/BasicUsageEnvironment/include
-I/usr/local/lib/live/groupsock/include   -c -o demux_rtp.o
demux_rtp.cpp ../libavcodec/avcodec.h:2226: warning: attribute ignored
in declaration of 'struct
ImgReSampleContext' ../libavcodec/avcodec.h:2226: warning: attribute
for 'struct ImgReSampleContext' must follow the 'struct'
keyword ../libavcodec/avcodec.h:2237: warning: 'ImgReSampleContext' is
deprecated (declared
at ../libavcodec/avcodec.h:2231) ../libavcodec/avcodec.h:2247: warning:
'ImgReSampleContext' is deprecated (declared
at ../libavcodec/avcodec.h:2231) ../libavcodec/avcodec.h:2253: warning:
'ImgReSampleContext' is deprecated (declared
at ../libavcodec/avcodec.h:2231) ../libavcodec/avcodec.h:2258: warning:
'ImgReSampleContext' is deprecated (declared
at ../libavcodec/avcodec.h:2231) /usr/include/unistd.h:1088: error:
declaration of 'void swab(const void*, void*, ssize_t) throw ()' throws
different exceptions ../mpbswap.h:5: error: from previous declaration
'void swab(const void*, void*, ssize_t)' make[1]: *** [demux_rtp.o]
Error 1 make[1]: Leaving directory `/usr/local/src/mplayer/libmpdemux'
make: *** [libmpdemux/libmpdemux.a] Error 2

Ciao,
 Roberto