diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-01-13 17:47:35 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-01-13 17:47:35 +0000 |
| commit | 3af8af7fe008ba200535744ed7e6d2c2b7233e2d (patch) | |
| tree | 9184079ab29126c444dcb71838abe74b6a01453b /src | |
| parent | 0f637614aca58c2eaf35231e682188a3177fe2b8 (diff) | |
| download | xine-lib-3af8af7fe008ba200535744ed7e6d2c2b7233e2d.tar.gz xine-lib-3af8af7fe008ba200535744ed7e6d2c2b7233e2d.tar.bz2 | |
Whoops, shame on me.
CVS patchset: 3902
CVS date: 2003/01/13 17:47:35
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/xine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 58eaaded8..086b018e6 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.218 2003/01/13 16:26:48 mroi Exp $ + * $Id: xine.c,v 1.219 2003/01/13 17:47:35 mroi Exp $ * * top-level xine functions * @@ -634,7 +634,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { subtitle_mrl[strlen(tmp)] = '\0'; } stream->slave = xine_stream_new (stream->xine, NULL, stream->video_out ); - stream->slave_affection = XINE_MASTER_SLAVE_PLAY || XINE_MASTER_SLAVE_STOP; + stream->slave_affection = XINE_MASTER_SLAVE_PLAY | XINE_MASTER_SLAVE_STOP; if( xine_open( stream->slave, subtitle_mrl ) ) { printf("xine: subtitle mrl opened\n"); stream->slave->master = stream; |