diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-10-08 20:44:34 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-10-08 20:44:34 +0000 |
| commit | ab9faee8cb2f4f732ed371a0e28228d3659e5aae (patch) | |
| tree | 1b4aaaf238ee79afa66642fb1e8a1ce7aff0bdac /src/input/libdvdnav/dvdnav.c | |
| parent | cfc01156e5851256eb337ffd4b734f7bc0d272a1 (diff) | |
| download | xine-lib-ab9faee8cb2f4f732ed371a0e28228d3659e5aae.tar.gz xine-lib-ab9faee8cb2f4f732ed371a0e28228d3659e5aae.tar.bz2 | |
sync to current CVS of libdvdnav
* fixes wrong subtitle appearing in the trailer of "Girl, Interrupted" RC2
* fixes "NAV packet expected, but none found" error when toggling between
menu and feature with the Escape key
CVS patchset: 7022
CVS date: 2004/10/08 20:44:34
Diffstat (limited to 'src/input/libdvdnav/dvdnav.c')
| -rw-r--r-- | src/input/libdvdnav/dvdnav.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c index 98b88f826..3a005a185 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.31 2004/10/05 19:07:09 hadess Exp $ + * $Id: dvdnav.c,v 1.32 2004/10/08 20:44:34 mroi Exp $ * */ @@ -668,16 +668,10 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf, fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_wide=%d\n",stream_change->physical_wide); fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_letterbox=%d\n",stream_change->physical_letterbox); fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_pan_scan=%d\n",stream_change->physical_pan_scan); + fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning DVDNAV_STATUS_OK\n"); #endif - if (stream_change->physical_wide != -1 && - stream_change->physical_letterbox != -1 && - stream_change->physical_pan_scan != -1) { -#ifdef LOG_DEBUG - fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning DVDNAV_STATUS_OK\n"); -#endif - pthread_mutex_unlock(&this->vm_lock); - return DVDNAV_STATUS_OK; - } + pthread_mutex_unlock(&this->vm_lock); + return DVDNAV_STATUS_OK; } /* has the audio channel changed? */ |