[MPlayer-dev-eng] [PATCH] MPlayer doesn't build with our current libdvdnav+libdvdread

[Nico Sabbi]

Il Thursday 22 November 2007 22:33:14 Dominik 'Rathann' Mierzejewski 
ha scritto:
> Two issues.
>
> 1. If both libdvdnav and libdvdread are used, wrong header
> locations are used, leading to:

fixed, thanks for your patch

>
> + /usr/bin/make
> ./version.sh `cc -dumpversion`
> cc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
> -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
> -ffast-math -I./libavcodec -I./libavformat -Wdisabled-optimization
> -Wno-pointer-sign -Wdeclaration-after-statement -I. -I.
> -I./libavutil -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
> -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64
> -mtune=generic -ffast-math -D_REENTRANT -D_LARGEFILE_SOURCE
> -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -I/usr/include/ 
> -I/usr/include/SDL  -D_REENTRANT -D_REENTRANT   -I/usr/include/cdda
> -I/usr/include/freetype2 -I/usr/include/fribidi  
> -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include
> -I/usr/include/atk-1.0 -I/usr/include/cairo
> -I/usr/include/pango-1.0 -I/usr/include/glib-2.0
> -I/usr/lib64/glib-2.0/include   -I/usr/include
> -I/usr/include/dvdnav   -c -o mplayer.o mplayer.c In file included
> from mplayer.c:169:
> stream/stream_dvd.h:7:24: error: dvd_reader.h: No such file or
> directory stream/stream_dvd.h:8:23: error: ifo_types.h: No such
> file or directory stream/stream_dvd.h:9:22: error: ifo_read.h: No
> such file or directory stream/stream_dvd.h:10:22: error:
> nav_read.h: No such file or directory
>
> 2. Since current libdvdread is similar to our internal, these
> #ifdefs in stream_dvd.c [...]
> #ifdef USE_DVDREAD_INTERNAL
>           if(pgc->audio_control[i].present) {
> #else
>           if(pgc->audio_control[i] & 0x8000) {
> #endif
> [...]
>

it's the other way around: because of how audio_mapping_t and
sub_mapping_t are defined in our mplayer's dvdread (and only there)
by means of conditional bitfields the deserve nothing less than
destruction (commit coming in moments...), thus in 
stream_dvd.c we have to remove - not keep - the DVDREAD_INTERNAL case