OSDN Git Service

x264 bump from r1698 to r1703
[handbrake-jp/handbrake-jp-git.git] / contrib / libdvdnav / A06-reset-mutex.patch
1 Index: src/dvdnav.c
2 ===================================================================
3 --- libdvdnav.orig/src/dvdnav.c (revision 1168)
4 +++ libdvdnav/src/dvdnav.c      (working copy)
5 @@ -178,9 +178,9 @@
6  #ifdef LOG_DEBUG
7    fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n");
8  #endif
9 +  pthread_mutex_unlock(&this->vm_lock);
10    result = dvdnav_clear(this);
11  
12 -  pthread_mutex_unlock(&this->vm_lock);
13    return result;
14  }
15  
16 @@ -519,7 +519,8 @@
17    }
18  
19    /* Check to see if we need to change the currently opened VOB */
20 -  if((this->position_current.vts != this->position_next.vts) ||
21 +  if((this->file == NULL) ||
22 +     (this->position_current.vts != this->position_next.vts) ||
23       (this->position_current.domain != this->position_next.domain)) {
24      dvd_read_domain_t domain;
25      int32_t vtsN;