aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorThierry Foucu <tfoucu@gmail.com>2014-05-27 11:23:09 -0700
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 03:25:41 +0200
commit12875df324e5d3c563176cb108b1c09182fe1dfa (patch)
tree5a4a2afbcfecd2d744090b60b1393db2303be4d1 /libavutil
parent919c320f7226bf873a9148e1db8994745f9d425d (diff)
downloadffmpeg-12875df324e5d3c563176cb108b1c09182fe1dfa.tar.gz
Timecode: Support 48fps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/timecode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/timecode.c b/libavutil/timecode.c
index d396032b9c..1dfd040868 100644
--- 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 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])