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
aae23381
Commit
aae23381
authored
Sep 21, 2004
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* pass the orignal movie size from es_format_t to subpicture_t
parent
e9ba2ffe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
include/vlc_video.h
include/vlc_video.h
+8
-6
modules/codec/spudec/parse.c
modules/codec/spudec/parse.c
+4
-1
No files found.
include/vlc_video.h
View file @
aae23381
...
...
@@ -253,12 +253,14 @@ struct subpicture_t
* changed by the video output thread, or simply ignored depending of the
* subtitle type. */
/**@{*/
int
i_x
;
/**< offset from alignment position */
int
i_y
;
/**< offset from alignment position */
int
i_width
;
/**< picture width */
int
i_height
;
/**< picture height */
int
b_absolute
;
/**< position is absolute */
int
i_flags
;
/**< position flags */
int
i_x
;
/**< offset from alignment position */
int
i_y
;
/**< offset from alignment position */
int
i_width
;
/**< picture width */
int
i_height
;
/**< picture height */
int
i_original_picture_width
;
/**< original width of the movie */
int
i_original_picture_height
;
/**< original height of the movie */
int
b_absolute
;
/**< position is absolute */
int
i_flags
;
/**< position flags */
/**@}*/
/** Pointer to function that renders this subtitle in a picture */
...
...
modules/codec/spudec/parse.c
View file @
aae23381
...
...
@@ -90,6 +90,9 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
/* Get display time now. If we do it later, we may miss the PTS. */
p_spu_data
->
i_pts
=
p_sys
->
i_pts
;
p_spu
->
i_original_picture_width
=
p_dec
->
fmt_in
.
subs
.
spu
.
i_original_frame_width
;
p_spu
->
i_original_picture_height
=
p_dec
->
fmt_in
.
subs
.
spu
.
i_original_frame_height
;
/* Getting the control part */
if
(
ParseControlSeq
(
p_dec
,
p_spu
,
p_spu_data
)
)
{
...
...
@@ -98,7 +101,7 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
return
NULL
;
}
/* We try to display it */
/* We try to display it */
if
(
ParseRLE
(
p_dec
,
p_spu
,
p_spu_data
)
)
{
/* There was a parse error, delete the subpicture */
...
...
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