Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
f1c33019
Commit
f1c33019
authored
Feb 15, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/demux/ogg.c: fixed recent breakage (what a shameful bug).
parent
50013713
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
18 deletions
+14
-18
modules/demux/ogg.c
modules/demux/ogg.c
+14
-18
No files found.
modules/demux/ogg.c
View file @
f1c33019
...
...
@@ -2,7 +2,7 @@
* ogg.c : ogg stream demux module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: ogg.c,v 1.5
7 2004/02/10 02:57:18 hartma
n Exp $
* $Id: ogg.c,v 1.5
8 2004/02/15 13:16:43 gbazi
n Exp $
*
* Author: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -436,9 +436,9 @@ static void Ogg_DecodePacket( input_thread_t *p_input,
p_stream
->
i_pcr
);
}
if
(
!
p_stream
->
fmt
.
i_codec
=
=
VLC_FOURCC
(
'v'
,
'o'
,
'r'
,
'b'
)
&&
!
p_stream
->
fmt
.
i_codec
=
=
VLC_FOURCC
(
's'
,
'p'
,
'x'
,
' '
)
&&
!
p_stream
->
fmt
.
i_codec
=
=
VLC_FOURCC
(
'f'
,
'l'
,
'a'
,
'c'
)
&&
if
(
p_stream
->
fmt
.
i_codec
!
=
VLC_FOURCC
(
'v'
,
'o'
,
'r'
,
'b'
)
&&
p_stream
->
fmt
.
i_codec
!
=
VLC_FOURCC
(
's'
,
'p'
,
'x'
,
' '
)
&&
p_stream
->
fmt
.
i_codec
!
=
VLC_FOURCC
(
'f'
,
'l'
,
'a'
,
'c'
)
&&
p_stream
->
i_pcr
>=
0
)
{
p_stream
->
i_previous_pcr
=
p_stream
->
i_pcr
;
...
...
@@ -456,10 +456,7 @@ static void Ogg_DecodePacket( input_thread_t *p_input,
return
;
}
if
(
!
(
p_block
=
block_New
(
p_input
,
p_oggpacket
->
bytes
)
)
)
{
return
;
}
if
(
!
(
p_block
=
block_New
(
p_input
,
p_oggpacket
->
bytes
)
)
)
return
;
if
(
p_stream
->
fmt
.
i_cat
==
AUDIO_ES
)
p_block
->
i_dts
=
p_block
->
i_pts
=
i_pts
;
...
...
@@ -489,24 +486,23 @@ static void Ogg_DecodePacket( input_thread_t *p_input,
if
(
p_stream
->
fmt
.
i_codec
==
VLC_FOURCC
(
's'
,
'u'
,
'b'
,
't'
))
{
/* But with subtitles we need to retrieve the duration first */
int
i
;
long
lenbytes
=
0
;
int
i
,
lenbytes
=
0
;
if
(
(
i_header_len
>
0
)
&&
(
p_oggpacket
->
bytes
>=
(
i_header_len
+
1
)
)
)
if
(
i_header_len
>
0
&&
p_oggpacket
->
bytes
>=
i_header_len
+
1
)
{
for
(
i
=
0
,
lenbytes
=
0
;
i
<
i_header_len
;
i
++
)
{
lenbytes
=
lenbytes
<<
8
;
lenbytes
+=
*
(
(
unsigned
char
*
)
p_oggpacket
->
packet
+
i_header_len
-
i
);
lenbytes
+=
*
(
p_oggpacket
->
packet
+
i_header_len
-
i
);
}
}
if
(((
p_oggpacket
->
bytes
-
1
-
i_header_len
)
>
2
)
||
(
(
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
' '
)
&&
(
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
0
)
&&
(
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
'\n'
)
&&
(
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
'\r'
))
)
if
(
p_oggpacket
->
bytes
-
1
-
i_header_len
>
2
||
(
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
' '
&&
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
0
&&
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
'\n'
&&
p_oggpacket
->
packet
[
i_header_len
+
1
]
!=
'\r'
)
)
{
p_block
->
i_dts
=
p_block
->
i_pts
+
(
mtime_t
)
lenbytes
*
1000
;
p_block
->
i_dts
=
p_block
->
i_pts
+
(
mtime_t
)
lenbytes
*
1000
;
}
}
...
...
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