projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
919c320
)
Timecode: Support 48fps
author
Thierry Foucu
<tfoucu@gmail.com>
Tue, 27 May 2014 18:23:09 +0000
(11:23 -0700)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 28 May 2014 01:25:41 +0000
(
03:25
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/timecode.c
patch
|
blob
|
history
diff --git
a/libavutil/timecode.c
b/libavutil/timecode.c
index
d396032
..
1dfd040
100644
(file)
--- a/
libavutil/timecode.c
+++ b/
libavutil/timecode.c
@@
-141,7
+141,7
@@
char *av_timecode_make_mpeg_tc_string(char *buf, uint32_t tc25bit)
static int check_fps(int fps)
{
int i;
static int check_fps(int fps)
{
int i;
- static const int supported_fps[] = {24, 25, 30, 50, 60};
+ static const int supported_fps[] = {24, 25, 30,
48,
50, 60};
for (i = 0; i < FF_ARRAY_ELEMS(supported_fps); i++)
if (fps == supported_fps[i])
for (i = 0; i < FF_ARRAY_ELEMS(supported_fps); i++)
if (fps == supported_fps[i])