Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
4d536223
Commit
4d536223
authored
Jun 03, 2004
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* mp4: fix for width in tkhd for video stream with null aspect.
parent
d67ece3d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
modules/mux/mp4.c
modules/mux/mp4.c
+13
-4
No files found.
modules/mux/mp4.c
View file @
4d536223
...
...
@@ -1562,10 +1562,15 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
}
else
if
(
p_stream
->
fmt
.
i_cat
==
VIDEO_ES
)
{
// width (presentation)
bo_add_32be
(
tkhd
,
p_stream
->
fmt
.
video
.
i_aspect
*
int
i_width
=
p_stream
->
fmt
.
video
.
i_width
;
if
(
p_stream
->
fmt
.
video
.
i_aspect
>
0
)
{
i_width
=
tkhd
,
p_stream
->
fmt
.
video
.
i_aspect
*
p_stream
->
fmt
.
video
.
i_height
/
VOUT_ASPECT_FACTOR
<<
16
);
VOUT_ASPECT_FACTOR
<<
16
;
}
// width (presentation)
bo_add_32be
(
tkhd
,
i_width
);
// height(presentation)
bo_add_32be
(
tkhd
,
p_stream
->
fmt
.
video
.
i_height
<<
16
);
}
...
...
@@ -1579,7 +1584,11 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux )
mp4_stream_t
*
tk
=
p_sys
->
pp_streams
[
i
];
if
(
tk
->
fmt
.
i_cat
==
VIDEO_ES
)
{
i_width
=
p_stream
->
fmt
.
video
.
i_aspect
*
p_stream
->
fmt
.
video
.
i_height
/
VOUT_ASPECT_FACTOR
;
if
(
p_stream
->
fmt
.
video
.
i_aspect
)
i_width
=
p_stream
->
fmt
.
video
.
i_aspect
*
p_stream
->
fmt
.
video
.
i_height
/
VOUT_ASPECT_FACTOR
;
else
i_width
=
p_stream
->
fmt
.
video
.
i_width
;
i_height
=
p_stream
->
fmt
.
video
.
i_height
;
break
;
}
...
...
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