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
d9752f14
Commit
d9752f14
authored
May 10, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Kill further I64C
I think I'm going to become stricter about NOT merging out-of-sync patches
parent
b54b2ddb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
modules/codec/kate.c
modules/codec/kate.c
+1
-1
modules/gui/wxwidgets/dialogs/vlm/vlm_slider_manager.cpp
modules/gui/wxwidgets/dialogs/vlm/vlm_slider_manager.cpp
+2
-2
No files found.
modules/codec/kate.c
View file @
d9752f14
...
...
@@ -564,7 +564,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
p_spu
->
p_region
->
psz_text
=
strdup
(
ev
->
text
);
/* no leak, this actually gets killed by the core */
p_spu
->
i_start
=
p_block
->
i_pts
;
p_spu
->
i_stop
=
p_block
->
i_pts
+
I
64
C
(
1000000
)
*
ev
->
duration
*
p_sys
->
ki
.
gps_denominator
/
p_sys
->
ki
.
gps_numerator
;
p_spu
->
i_stop
=
p_block
->
i_pts
+
I
NT64_
C
(
1000000
)
*
ev
->
duration
*
p_sys
->
ki
.
gps_denominator
/
p_sys
->
ki
.
gps_numerator
;
p_spu
->
b_ephemer
=
(
p_block
->
i_length
==
0
);
p_spu
->
b_absolute
=
false
;
...
...
modules/gui/wxwidgets/dialogs/vlm/vlm_slider_manager.cpp
View file @
d9752f14
...
...
@@ -204,10 +204,10 @@ void VLMSliderManager::ProcessUpdate( wxScrollEvent &event )
char psz_time[ MSTRTIME_MAX_SIZE ], psz_total[ MSTRTIME_MAX_SIZE ];
mtime_t i_seconds;
i_seconds = var_GetTime( p_input, "length" ) / I
64C(
1000000 );
i_seconds = var_GetTime( p_input, "length" ) / I
NT64_C(
1000000 );
secstotimestr( psz_total, i_seconds );
i_seconds = var_GetTime( p_input, "time" ) /
I64C(
1000000 );
i_seconds = var_GetTime( p_input, "time" ) /
INT_64C(
1000000 );
secstotimestr( psz_time, i_seconds );
time_string = wxU(psz_time) + wxString(wxT(" / ") ) +wxU(psz_total) ;
...
...
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