From 5ed3bfa479e5c121e8f82e2ab8fc67e81bead2e1 Mon Sep 17 00:00:00 2001
From: sherpya <sherpya@netfarm.it>
Date: Wed, 12 Mar 2014 03:11:42 +0100
Subject: [PATCH 27/29] dvdnav: use dvdnav/read from videolan git

see: https://github.com/sherpya/mplayer-be/blob/master/patches/mp/0027-dvdnav-use-dvdnav-read-from-videolan-git.patch

---
 configure              | 4 ++--
 stream/stream_dvdnav.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git configure configure
index de443b1..5aeb761 100755
--- configure
+++ configure
@@ -8193,8 +8193,8 @@ if test "$_dvdnav" = yes ; then
     cflags_libdvdnav="-Ilibdvdnav"
     inputmodules="dvdnav(internal) $inputmodules"
   else
-    extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
-    extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
+    extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnav)"
+    extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnav)"
     inputmodules="dvdnav $inputmodules"
   fi
 else
diff --git stream/stream_dvdnav.c stream/stream_dvdnav.c
index dbf4226..c6b69e7 100644
--- stream/stream_dvdnav.c
+++ stream/stream_dvdnav.c
@@ -714,13 +714,13 @@ static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t l
 
   format = dvdnav_audio_stream_format(priv->dvdnav, lg);
   switch(format) {
-  case DVDNAV_FORMAT_AC3:
+  case DVD_AUDIO_FORMAT_AC3:
     return index + 128;
-  case DVDNAV_FORMAT_DTS:
+  case DVD_AUDIO_FORMAT_DTS:
     return index + 136;
-  case DVDNAV_FORMAT_LPCM:
+  case DVD_AUDIO_FORMAT_LPCM:
     return index + 160;
-  case DVDNAV_FORMAT_MPEGAUDIO:
+  case DVD_AUDIO_FORMAT_MPEG2_EXT:
     return index;
   default:
     return -1;
-- 
2.1.1