Mercurial > libdvdnav.hg
changeset 143:0b302ca31859 src
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
on syncing
| author | mroi |
|---|---|
| date | Tue, 01 Apr 2003 11:30:56 +0000 |
| parents | e375b765ebf5 |
| children | 19a31f4f57cb |
| files | dvdnav.c |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dvdnav.c Tue Apr 01 11:28:54 2003 +0000 +++ b/dvdnav.c Tue Apr 01 11:30:56 2003 +0000 @@ -654,9 +654,9 @@ stream_change->physical_pan_scan = vm_get_subp_active_stream(this->vm, 2); this->position_current.spu_channel = this->position_next.spu_channel; #ifdef LOG_DEBUG - 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 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); #endif if (stream_change->physical_wide != -1 && stream_change->physical_letterbox != -1 && @@ -681,7 +681,7 @@ stream_change->physical = vm_get_audio_active_stream( this->vm ); this->position_current.audio_channel = this->position_next.audio_channel; #ifdef LOG_DEBUG - fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change.physical); + fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change->physical); #endif pthread_mutex_unlock(&this->vm_lock); return S_OK; @@ -1079,6 +1079,10 @@ /* * $Log$ + * Revision 1.50 2003/04/01 11:30:56 mroi + * merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost + * on syncing + * * Revision 1.49 2003/04/01 11:28:54 mroi * some more sanity checking will prevent segfaults in these functions *