← Back to branch summary

~ubuntu-branches/ubuntu/wily/mpv/wily

« back to all changes in this revision

Viewing changes to stream/stream_dvd.c

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2015-02-08 11:38:05 UTC
  • mfrom: (28.1.4 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20150208113805-hb7kk68170y002es
Tags: 0.7.3-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/rules:
    + Disable altivec on ppc64el again, as it FTBFS with it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
stream/stream_dvd.c
682
682
        snprintf(temp_device, len, "/dev/rdisk%d", i);
683
683
        dvd = DVDOpen(temp_device);
684
684
        if(!dvd) {
685
 
          MP_ERR(stream, "Couldn't open DVD device: %s (%s)\n",temp_device, strerror(errno));
 
685
          MP_ERR(stream, "Couldn't open DVD device: %s (%s)\n",temp_device,
 
686
                 mp_strerror(errno));
686
687
        } else {
687
688
#if DVDREAD_VERSION <= LIBDVDREAD_VERSION(0,9,4)
688
689
          dvd_file_t *dvdfile = DVDOpenFile(dvd,d->dvd_title,DVD_READ_INFO_FILE);
689
690
          if(!dvdfile) {
690
 
            MP_ERR(stream, "Couldn't open DVD device: %s (%s)\n",temp_device, strerror(errno));
 
691
            MP_ERR(stream, "Couldn't open DVD device: %s (%s)\n",temp_device,
 
692
                   mp_strerror(errno));
691
693
            DVDClose(dvd);
692
694
            continue;
693
695
          }
706
708
    {
707
709
        dvd = DVDOpen(d->dvd_device_current);
708
710
        if(!dvd) {
709
 
          MP_ERR(stream, "Couldn't open DVD device: %s (%s)\n",d->dvd_device_current, strerror(errno));
 
711
          MP_ERR(stream, "Couldn't open DVD device: %s (%s)\n",
 
712
                 d->dvd_device_current, mp_strerror(errno));
710
713
          return STREAM_UNSUPPORTED;
711
714
        }
712
715
    }