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
eadc6196
Commit
eadc6196
authored
Apr 05, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x265: default to 25fps if frame rate is not set
parent
4867c2a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
modules/codec/x265.c
modules/codec/x265.c
+9
-1
No files found.
modules/codec/x265.c
View file @
eadc6196
...
@@ -170,9 +170,17 @@ static int Open (vlc_object_t *p_this)
...
@@ -170,9 +170,17 @@ static int Open (vlc_object_t *p_this)
#if X265_BUILD >= 6
#if X265_BUILD >= 6
param
->
fpsNum
=
p_enc
->
fmt_in
.
video
.
i_frame_rate
;
param
->
fpsNum
=
p_enc
->
fmt_in
.
video
.
i_frame_rate
;
param
->
fpsDenom
=
p_enc
->
fmt_in
.
video
.
i_frame_rate_base
;
param
->
fpsDenom
=
p_enc
->
fmt_in
.
video
.
i_frame_rate_base
;
if
(
!
param
->
fpsNum
)
{
param
->
fpsNum
=
25
;
param
->
fpsDenom
=
1
;
}
#else
#else
param
->
frameRate
=
p_enc
->
fmt_in
.
video
.
i_frame_rate
/
if
(
p_enc
->
fmt_in
.
video
.
i_frame_rate_base
)
{
param
->
frameRate
=
p_enc
->
fmt_in
.
video
.
i_frame_rate
/
p_enc
->
fmt_in
.
video
.
i_frame_rate_base
;
p_enc
->
fmt_in
.
video
.
i_frame_rate_base
;
}
else
{
param
->
frameRate
=
25
;
}
#endif
#endif
param
->
sourceWidth
=
p_enc
->
fmt_in
.
video
.
i_visible_width
;
param
->
sourceWidth
=
p_enc
->
fmt_in
.
video
.
i_visible_width
;
param
->
sourceHeight
=
p_enc
->
fmt_in
.
video
.
i_visible_height
;
param
->
sourceHeight
=
p_enc
->
fmt_in
.
video
.
i_visible_height
;
...
...
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