Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
65645005
Commit
65645005
authored
Mar 09, 2005
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/demux/ps.[c,h]: fixed PSM parsing bug.
parent
a1824ef1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
modules/demux/ps.c
modules/demux/ps.c
+8
-2
modules/demux/ps.h
modules/demux/ps.h
+1
-1
No files found.
modules/demux/ps.c
View file @
65645005
...
...
@@ -220,7 +220,9 @@ static int Demux( demux_t *p_demux )
break
;
case
0x1bc
:
/* msg_Dbg( p_demux, "received PSM"); */
if
(
p_sys
->
psm
.
i_version
==
0xFFFF
)
msg_Dbg
(
p_demux
,
"contains a PSM"
);
ps_psm_fill
(
&
p_sys
->
psm
,
p_pkt
,
p_sys
->
tk
,
p_demux
->
out
);
block_Release
(
p_pkt
);
break
;
...
...
@@ -236,6 +238,10 @@ static int Demux( demux_t *p_demux )
{
tk
->
es
=
es_out_Add
(
p_demux
->
out
,
&
tk
->
fmt
);
}
else
{
msg_Dbg
(
p_demux
,
"es id=0x%x format unknown"
,
i_id
);
}
tk
->
b_seen
=
VLC_TRUE
;
}
...
...
@@ -416,7 +422,7 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
else
{
/* Normal case */
return
stream_Block
(
s
,
i_size
);
return
stream_Block
(
s
,
i_size
);
}
return
NULL
;
...
...
modules/demux/ps.h
View file @
65645005
...
...
@@ -430,7 +430,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
if
(
!
p_psm
||
p_buffer
[
3
]
!=
0xbc
)
return
VLC_EGENERIC
;
i_length
=
(
uint16_t
)(
p_buffer
[
4
]
<<
8
)
+
p_buffer
[
5
];
i_length
=
(
uint16_t
)(
p_buffer
[
4
]
<<
8
)
+
p_buffer
[
5
]
+
6
;
if
(
i_length
>
i_buffer
)
return
VLC_EGENERIC
;
//i_current_next_indicator = (p_buffer[6] && 0x01);
...
...
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