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
cb72f894
Commit
cb72f894
authored
Nov 27, 2001
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a potential packet corruption in the DVD input (I suspect this
might be the cause of the OS X problem - please confirm).
parent
6df445cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
extras/libdvdcss/libdvdcss.c
extras/libdvdcss/libdvdcss.c
+4
-1
src/input/input_netlist.c
src/input/input_netlist.c
+17
-1
No files found.
extras/libdvdcss/libdvdcss.c
View file @
cb72f894
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* libdvdcss.c: DVD reading library.
* libdvdcss.c: DVD reading library.
*****************************************************************************
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* Copyright (C) 1998-2001 VideoLAN
* $Id: libdvdcss.c,v 1.2
3 2001/11/26 15:56:36
massiot Exp $
* $Id: libdvdcss.c,v 1.2
4 2001/11/27 10:18:33
massiot Exp $
*
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Authors: Stphane Borel <stef@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Samuel Hocevar <sam@zoy.org>
...
@@ -490,11 +490,14 @@ static int _dvdcss_raw_open ( dvdcss_handle dvdcss, char *psz_target )
...
@@ -490,11 +490,14 @@ static int _dvdcss_raw_open ( dvdcss_handle dvdcss, char *psz_target )
if
(
dvdcss
->
i_raw_fd
==
-
1
)
if
(
dvdcss
->
i_raw_fd
==
-
1
)
{
{
_dvdcss_error
(
dvdcss
,
"failed opening raw device, continuing"
);
_dvdcss_error
(
dvdcss
,
"failed opening raw device, continuing"
);
return
-
1
;
}
}
else
else
{
{
dvdcss
->
i_read_fd
=
dvdcss
->
i_raw_fd
;
dvdcss
->
i_read_fd
=
dvdcss
->
i_raw_fd
;
}
}
return
0
;
}
}
#endif
#endif
...
...
src/input/input_netlist.c
View file @
cb72f894
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
* will only be given back to netlist when refcount is zero.
* will only be given back to netlist when refcount is zero.
*****************************************************************************
*****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: input_netlist.c,v 1.4
3 2001/11/11 01:32:03 stef
Exp $
* $Id: input_netlist.c,v 1.4
4 2001/11/27 10:18:33 massiot
Exp $
*
*
* Authors: Henri Fallon <henri@videolan.org>
* Authors: Henri Fallon <henri@videolan.org>
* Stphane Borel <stef@videolan.org>
* Stphane Borel <stef@videolan.org>
...
@@ -363,6 +363,14 @@ void input_NetlistMviovec( void * p_method_data, int i_nb_iovec,
...
@@ -363,6 +363,14 @@ void input_NetlistMviovec( void * p_method_data, int i_nb_iovec,
pp_data
[
i_loop
]
->
p_buffer
=
pp_data
[
i_loop
]
->
p_buffer
=
p_netlist
->
p_free_iovec
[
p_netlist
->
i_iovec_start
].
iov_base
;
p_netlist
->
p_free_iovec
[
p_netlist
->
i_iovec_start
].
iov_base
;
pp_data
[
i_loop
]
->
p_payload_start
=
pp_data
[
i_loop
]
->
p_buffer
;
pp_data
[
i_loop
]
->
p_payload_end
=
pp_data
[
i_loop
]
->
p_buffer
+
p_netlist
->
i_buffer_size
;
pp_data
[
i_loop
]
->
p_next
=
NULL
;
pp_data
[
i_loop
]
->
b_discard_payload
=
0
;
pp_data
[
i_loop
]
->
pi_refcount
=
p_netlist
->
pi_refcount
+
pp_data
[
i_loop
]
->
pi_refcount
=
p_netlist
->
pi_refcount
+
p_netlist
->
i_iovec_start
;
p_netlist
->
i_iovec_start
;
(
*
pp_data
[
i_loop
]
->
pi_refcount
)
++
;
(
*
pp_data
[
i_loop
]
->
pi_refcount
)
++
;
...
@@ -408,6 +416,14 @@ struct data_packet_s * input_NetlistNewPtr( void * p_method_data )
...
@@ -408,6 +416,14 @@ struct data_packet_s * input_NetlistNewPtr( void * p_method_data )
p_netlist
->
i_data_start
++
;
p_netlist
->
i_data_start
++
;
p_netlist
->
i_data_start
&=
p_netlist
->
i_nb_data
;
p_netlist
->
i_data_start
&=
p_netlist
->
i_nb_data
;
p_return
->
p_payload_start
=
p_return
->
p_buffer
;
p_return
->
p_payload_end
=
p_return
->
p_buffer
+
p_netlist
->
i_buffer_size
;
p_return
->
p_next
=
NULL
;
p_return
->
b_discard_payload
=
0
;
/* unlock */
/* unlock */
vlc_mutex_unlock
(
&
p_netlist
->
lock
);
vlc_mutex_unlock
(
&
p_netlist
->
lock
);
...
...
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