diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-01-27 21:02:41 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-01-27 21:02:41 +0000 |
| commit | ce9cab70cdb63af72b2b6edabd94779d2b89c2fe (patch) | |
| tree | b2e35773dfd4a89d57d7a1284526c83a2a944e17 | |
| parent | 82194e1f8c892ad93bedc643021b4b1442ae53f3 (diff) | |
| download | xine-lib-ce9cab70cdb63af72b2b6edabd94779d2b89c2fe.tar.gz xine-lib-ce9cab70cdb63af72b2b6edabd94779d2b89c2fe.tar.bz2 | |
temporary fix for segfaulting DVDs
libdvdnav cleanup needed (will start tomorrow)
CVS patchset: 4021
CVS date: 2003/01/27 21:02:41
| -rw-r--r-- | src/input/libdvdnav/diff_against_cvs.patch | 2 | ||||
| -rw-r--r-- | src/input/libdvdnav/dvdnav.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch index df4658ee3..c07584634 100644 --- a/src/input/libdvdnav/diff_against_cvs.patch +++ b/src/input/libdvdnav/diff_against_cvs.patch @@ -36,7 +36,7 @@ #include <stdlib.h> #include <stdio.h> -@@ -181,7 +181,7 @@ +@@ -183,7 +183,7 @@ struct timeval time; /* Create a new structure */ diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c index e6c699812..7fdbd12b9 100644 --- a/src/input/libdvdnav/dvdnav.c +++ b/src/input/libdvdnav/dvdnav.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dvdnav.c,v 1.10 2002/10/22 17:18:23 jkeil Exp $ + * $Id: dvdnav.c,v 1.11 2003/01/27 21:02:42 mroi Exp $ * */ @@ -82,6 +82,8 @@ static int8_t NCLK_dvdnav_get_audio_logical_stream(dvdnav_t *this, uint8_t audio audio_num = 0; state = &(this->vm->state); + if (!state || !state->pgc) + return -1; if(audio_num < 8) { if(state->pgc->audio_control[audio_num] & (1 << 15)) { @@ -1010,6 +1012,10 @@ uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) { /* * $Log: dvdnav.c,v $ + * Revision 1.11 2003/01/27 21:02:42 mroi + * temporary fix for segfaulting DVDs + * libdvdnav cleanup needed (will start tomorrow) + * * Revision 1.10 2002/10/22 17:18:23 jkeil * Recursive comments, picked up via CVS $Log keyword. Trying to fix... * |