Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
8ae1aa12
Commit
8ae1aa12
authored
Feb 07, 2003
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ./modules/access/dvdplay/demux.c: fixed a minor warning.
parent
f7c92985
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
13 deletions
+14
-13
include/interface.h
include/interface.h
+3
-3
modules/access/dvdplay/demux.c
modules/access/dvdplay/demux.c
+11
-10
No files found.
include/interface.h
View file @
8ae1aa12
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* interface, such as message output.
* interface, such as message output.
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* Copyright (C) 1999, 2000 VideoLAN
* $Id: interface.h,v 1.3
8 2003/02/06 23:59:40
sam Exp $
* $Id: interface.h,v 1.3
9 2003/02/07 00:26:23
sam Exp $
*
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
*
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...
@@ -39,7 +39,7 @@ struct intf_thread_t
...
@@ -39,7 +39,7 @@ struct intf_thread_t
/* Specific interfaces */
/* Specific interfaces */
intf_console_t
*
p_console
;
/* console */
intf_console_t
*
p_console
;
/* console */
intf_sys_t
*
p_sys
;
/* system interface */
intf_sys_t
*
p_sys
;
/* system interface */
/* Interface module */
/* Interface module */
module_t
*
p_module
;
module_t
*
p_module
;
void
(
*
pf_run
)
(
intf_thread_t
*
);
void
(
*
pf_run
)
(
intf_thread_t
*
);
...
...
modules/access/dvdplay/demux.c
View file @
8ae1aa12
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* demux.c: demux functions for dvdplay.
* demux.c: demux functions for dvdplay.
*****************************************************************************
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* Copyright (C) 1998-2001 VideoLAN
* $Id: demux.c,v 1.
4 2003/02/06 23:59:40
sam Exp $
* $Id: demux.c,v 1.
5 2003/02/07 00:26:23
sam Exp $
*
*
* Author: Stphane Borel <stef@via.ecp.fr>
* Author: Stphane Borel <stef@via.ecp.fr>
*
*
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
#include <vlc/vlc.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/input.h>
#include <vlc/intf.h>
#include "../../demux/mpeg/system.h"
#include "../../demux/mpeg/system.h"
...
@@ -147,7 +148,7 @@ static int Demux( input_thread_t * p_input )
...
@@ -147,7 +148,7 @@ static int Demux( input_thread_t * p_input )
int
i_data_nb
=
0
;
int
i_data_nb
=
0
;
p_dvd
=
p_input
->
p_demux_data
->
p_dvd
;
p_dvd
=
p_input
->
p_demux_data
->
p_dvd
;
/* Read headers to compute payload length */
/* Read headers to compute payload length */
do
do
{
{
...
@@ -161,14 +162,14 @@ static int Demux( input_thread_t * p_input )
...
@@ -161,14 +162,14 @@ static int Demux( input_thread_t * p_input )
i_remains
=
p_input
->
p_last_data
-
p_input
->
p_current_data
;
i_remains
=
p_input
->
p_last_data
-
p_input
->
p_current_data
;
p_input
->
p_demux_data
->
mpeg
.
pf_demux_ps
(
p_input
,
p_data
);
p_input
->
p_demux_data
->
mpeg
.
pf_demux_ps
(
p_input
,
p_data
);
++
i_data_nb
;
++
i_data_nb
;
}
}
while
(
i_remains
);
while
(
i_remains
);
// if( p_dvd->b_still && p_dvd->b_end_of_cell && p_dvd->p_intf != NULL )
// if( p_dvd->b_still && p_dvd->b_end_of_cell && p_dvd->p_intf != NULL )
if
(
p_dvd
->
i_still_time
&&
p_dvd
->
b_end_of_cell
&&
p_dvd
->
p_intf
!=
NULL
)
if
(
p_dvd
->
i_still_time
&&
p_dvd
->
b_end_of_cell
&&
p_dvd
->
p_intf
!=
NULL
)
{
{
...
@@ -179,14 +180,14 @@ static int Demux( input_thread_t * p_input )
...
@@ -179,14 +180,14 @@ static int Demux( input_thread_t * p_input )
dvdIntfStillTime
(
p_dvd
->
p_intf
,
p_dvd
->
i_still_time
);
dvdIntfStillTime
(
p_dvd
->
p_intf
,
p_dvd
->
i_still_time
);
p_dvd
->
i_still_time
=
0
;
p_dvd
->
i_still_time
=
0
;
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
p_pgrm
=
p_input
->
stream
.
p_selected_program
;
p_pgrm
=
p_input
->
stream
.
p_selected_program
;
p_pgrm
->
i_synchro_state
=
SYNCHRO_REINIT
;
p_pgrm
->
i_synchro_state
=
SYNCHRO_REINIT
;
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
input_ClockManageControl
(
p_input
,
p_pgrm
,
0
);
input_ClockManageControl
(
p_input
,
p_pgrm
,
0
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment