Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
6d887eca
Commit
6d887eca
authored
Apr 09, 2012
by
Hendrik Leppkes
Committed by
Michael Niedermayer
Jun 21, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add 48 fps to the NTSC framerates
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
2d61f004
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
avformat.h
libavformat/avformat.h
+1
-1
utils.c
libavformat/utils.c
+1
-1
No files found.
libavformat/avformat.h
View file @
6d887eca
...
...
@@ -726,7 +726,7 @@ typedef struct AVStream {
/**
* Stream information used internally by av_find_stream_info()
*/
#define MAX_STD_TIMEBASES (60*12+
5
)
#define MAX_STD_TIMEBASES (60*12+
6
)
struct
{
int64_t
last_dts
;
int64_t
duration_gcd
;
...
...
libavformat/utils.c
View file @
6d887eca
...
...
@@ -2422,7 +2422,7 @@ static void compute_chapters_end(AVFormatContext *s)
static
int
get_std_framerate
(
int
i
){
if
(
i
<
60
*
12
)
return
i
*
1001
;
else
return
((
const
int
[]){
24
,
30
,
60
,
12
,
15
})[
i
-
60
*
12
]
*
1000
*
12
;
else
return
((
const
int
[]){
24
,
30
,
60
,
12
,
15
,
48
})[
i
-
60
*
12
]
*
1000
*
12
;
}
/*
...
...
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