Ticket #45387: patch-stream_dvdnav.diff

File patch-stream_dvdnav.diff, 1.7 KB (added by ctreleaven (Craig Treleaven), 10 years ago)

  • configure 

    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
    if test "$_dvdnav" = yes ; then 
    81938193    cflags_libdvdnav="-Ilibdvdnav"
    81948194    inputmodules="dvdnav(internal) $inputmodules"
    81958195  else
    8196     extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
    8197     extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
     8196    extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnav)"
     8197    extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnav)"
    81988198    inputmodules="dvdnav $inputmodules"
    81998199  fi
    82008200else

  • stream/stream_dvdnav.c 

    diff --git stream/stream_dvdnav.c stream/stream_dvdnav.c
index dbf4226..c6b69e7 100644
    static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t l 
    714714
    715715  format = dvdnav_audio_stream_format(priv->dvdnav, lg);
    716716  switch(format) {
    717   case DVDNAV_FORMAT_AC3:
     717  case DVD_AUDIO_FORMAT_AC3:
    718718    return index + 128;
    719   case DVDNAV_FORMAT_DTS:
     719  case DVD_AUDIO_FORMAT_DTS:
    720720    return index + 136;
    721   case DVDNAV_FORMAT_LPCM:
     721  case DVD_AUDIO_FORMAT_LPCM:
    722722    return index + 160;
    723   case DVDNAV_FORMAT_MPEGAUDIO:
     723  case DVD_AUDIO_FORMAT_MPEG2_EXT:
    724724    return index;
    725725  default:
    726726    return -1;