Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
73620c74
Commit
73620c74
authored
May 30, 2001
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Fixed a bug introduced in my previous commit which broke DVD input.
parent
a3b65002
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
plugins/dvd/input_dvd.c
plugins/dvd/input_dvd.c
+1
-5
src/input/input.c
src/input/input.c
+13
-3
No files found.
plugins/dvd/input_dvd.c
View file @
73620c74
...
...
@@ -10,7 +10,7 @@
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.6
1
2001/05/30
17:03:12
sam Exp $
* $Id: input_dvd.c,v 1.6
2
2001/05/30
22:16:07
sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
...
...
@@ -192,10 +192,6 @@ static void DVDInit( input_thread_t * p_input )
p_input
->
p_plugin_data
=
(
void
*
)
p_dvd
;
p_input
->
p_method_data
=
NULL
;
/* Set callback */
p_input
->
pf_open
=
p_input
->
pf_file_open
;
p_input
->
pf_close
=
p_input
->
pf_file_close
;
p_dvd
->
i_fd
=
p_input
->
i_handle
;
/* reading several block once seems to cause lock-up
...
...
src/input/input.c
View file @
73620c74
...
...
@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.11
3
2001/05/30
17:03:12
sam Exp $
* $Id: input.c,v 1.11
4
2001/05/30
22:16:07
sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
...
...
@@ -351,6 +351,10 @@ static int InitThread( input_thread_t * p_input )
p_input
->
c_packets_trashed
=
0
;
#endif
/* Default, might get overwritten */
p_input
->
pf_open
=
p_input
->
pf_file_open
;
p_input
->
pf_close
=
p_input
->
pf_file_close
;
p_input
->
p_input_module
=
module_Need
(
MODULE_CAPABILITY_INPUT
,
(
probedata_t
*
)
p_input
);
...
...
@@ -363,8 +367,14 @@ static int InitThread( input_thread_t * p_input )
#define f p_input->p_input_module->p_functions->input.functions.input
p_input
->
pf_init
=
f
.
pf_init
;
p_input
->
pf_open
=
f
.
pf_open
;
p_input
->
pf_close
=
f
.
pf_close
;
if
(
f
.
pf_open
!=
NULL
)
{
p_input
->
pf_open
=
f
.
pf_open
;
}
if
(
f
.
pf_close
!=
NULL
)
{
p_input
->
pf_close
=
f
.
pf_close
;
}
p_input
->
pf_end
=
f
.
pf_end
;
p_input
->
pf_read
=
f
.
pf_read
;
p_input
->
pf_set_area
=
f
.
pf_set_area
;
...
...
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