RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

dvd: treat missing volume ID as "unsupported", not error 

This is probably better and more consistent with the rest of the code,
although it doesn't change any currently existing behavior in this case.
This commit is contained in:
wm4 2014-02-23 18:15:32 +01:00
parent f30149e80e
commit 40486fd8bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stream/stream_dvd.c
View File

@ -732,9 +732,9 @@ static int control(stream_t *stream,int cmd,void* arg)
char buffer[128];
if (DVDUDFVolumeInfo(d->dvd, buffer, sizeof(buffer), NULL, 0) < 0 &&
DVDISOVolumeInfo(d->dvd, buffer, sizeof(buffer), NULL, 0) < 0)
return STREAM_ERROR;
break;
if (!buffer[0])
return STREAM_ERROR;
break;
*(char**)arg = talloc_strdup(NULL, buffer);
return STREAM_OK;
}

4
stream/stream_dvdnav.c
View File

@ -605,9 +605,9 @@ static int control(stream_t *stream, int cmd, void *arg)
case STREAM_CTRL_GET_DVD_VOLUME_ID: {
const char *volume = NULL;
if (dvdnav_get_title_string(dvdnav, &volume) != DVDNAV_STATUS_OK)
return STREAM_ERROR;
break;
if (!volume || !volume[0])
return STREAM_ERROR;
break;
*(char**)arg = talloc_strdup(NULL, volume);
return STREAM_OK;
}