Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
6b01e3ef
Commit
6b01e3ef
authored
Mar 15, 2013
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: don't offset dts/pts to start from 0, avformat should nowadays handle that just fine
parent
75890fb5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
modules/demux/avformat/mux.c
modules/demux/avformat/mux.c
+0
-10
No files found.
modules/demux/avformat/mux.c
View file @
6b01e3ef
...
...
@@ -59,8 +59,6 @@ struct sout_mux_sys_t
bool
b_write_header
;
bool
b_error
;
int64_t
i_initial_dts
;
};
/*****************************************************************************
...
...
@@ -129,7 +127,6 @@ int OpenMux( vlc_object_t *p_this )
p_sys
->
b_write_header
=
true
;
p_sys
->
b_error
=
false
;
p_sys
->
i_initial_dts
=
0
;
/* Fill p_mux fields */
p_mux
->
pf_control
=
Control
;
...
...
@@ -277,10 +274,6 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
if
(
p_data
->
i_flags
&
BLOCK_FLAG_TYPE_I
)
pkt
.
flags
|=
AV_PKT_FLAG_KEY
;
/* avformat expects pts/dts which start from 0 */
p_data
->
i_dts
-=
p_mux
->
p_sys
->
i_initial_dts
;
p_data
->
i_pts
-=
p_mux
->
p_sys
->
i_initial_dts
;
if
(
p_data
->
i_pts
>
0
)
pkt
.
pts
=
p_data
->
i_pts
*
p_stream
->
time_base
.
den
/
INT64_C
(
1000000
)
/
p_stream
->
time_base
.
num
;
...
...
@@ -351,9 +344,6 @@ static int Mux( sout_mux_t *p_mux )
if
(
i_stream
<
0
)
return
VLC_SUCCESS
;
if
(
!
p_mux
->
p_sys
->
i_initial_dts
)
p_mux
->
p_sys
->
i_initial_dts
=
i_dts
;
MuxBlock
(
p_mux
,
p_mux
->
pp_inputs
[
i_stream
]
);
}
...
...
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