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
edb034c3
Commit
edb034c3
authored
Jan 16, 2004
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ts: fixed mpeg4 video in TS.
parent
d7b07afe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
modules/demux/ts.c
modules/demux/ts.c
+12
-2
No files found.
modules/demux/ts.c
View file @
edb034c3
...
...
@@ -2,7 +2,7 @@
* ts.c: Transport Stream input module for VLC.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: ts.c,v 1.
1 2004/01/16 01:47:4
1 fenrir Exp $
* $Id: ts.c,v 1.
2 2004/01/16 02:01:1
1 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -737,7 +737,15 @@ static void ParsePES ( demux_t *p_demux, ts_pid_t *pid )
{
p_pes
->
i_pts
=
i_pts
*
100
/
9
;
}
es_out_Send
(
p_demux
->
out
,
pid
->
es
->
id
,
p_pes
);
if
(
pid
->
es
->
p_mpeg4desc
)
{
/* For mpeg4 we first gather the packet -> will make ffmpeg happier */
es_out_Send
(
p_demux
->
out
,
pid
->
es
->
id
,
block_ChainGather
(
p_pes
)
);
}
else
{
es_out_Send
(
p_demux
->
out
,
pid
->
es
->
id
,
p_pes
);
}
}
else
{
...
...
@@ -1464,6 +1472,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
default:
pid
->
es
->
fmt
.
i_cat
=
UNKNOWN_ES
;
break
;
}
}
else
if
(
dcd
->
i_streamType
==
0x05
)
/* AudioStream */
...
...
@@ -1487,6 +1496,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
break
;
default:
pid
->
es
->
fmt
.
i_cat
=
UNKNOWN_ES
;
break
;
}
}
else
...
...
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