← Back to branch summary

~siretart/vlc/debian-packaging

« back to all changes in this revision

Viewing changes to modules/access/bluray.c

  • Committer: Sebastian Ramacher
  • Date: 2016-01-31 20:58:37 UTC
  • mfrom: (1.2.39)
  • Revision ID: git-v1:b7ac1de93ecf7cd3d86898544433974ce0af7086
Merge tag 'upstream/2.2.2'

Upstream version 2.2.2

# gpg: Signature made Sun 31 Jan 2016 21:57:53 CET using RSA key ID 6EA71993
# gpg: Good signature from "Sebastian Ramacher <sebastian@ramacher.at>"
# gpg:                 aka "Sebastian Ramacher <s.ramacher@gmail.com>"
# gpg:                 aka "Sebastian Ramacher <s.ramacher@gmx.at>"
# gpg:                 aka "Sebastian Ramacher <s.ramacher@student.tugraz.at>"
# gpg:                 aka "Sebastian Ramacher <sramacher@debian.org>"
# gpg:                 aka "Sebastian Ramacher <sebastian.ramacher@iaik.tugraz.at>"

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/access/bluray.c
1621
1621
        blurayUpdateCurrentClip(p_demux, e->param);
1622
1622
        break;
1623
1623
    case BD_EVENT_CHAPTER:
 
1624
        if (e->param && e->param < 0xffff)
 
1625
          p_demux->info.i_seekpoint = e->param - 1;
 
1626
        else
 
1627
          p_demux->info.i_seekpoint = 0;
1624
1628
        p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
1625
 
        p_demux->info.i_seekpoint = e->param;
1626
1629
        break;
1627
1630
    case BD_EVENT_ANGLE:
1628
1631
        break;