Merge pull request #1239 in FS/freeswitch from ~J0SH/freeswitch:fs10126 to master

* commit '624d3dd0f52c02e1b9c2ad69867328e9ad1b0143':
  FS-10126: Add 24fps mode.
This commit is contained in:
Mike Jerris 2017-03-24 17:11:55 +00:00
commit e3a14baec7
1 changed files with 2 additions and 0 deletions

View File

@ -6264,6 +6264,7 @@ static struct core_fps_s FPS_VALS[] = {
{15.0f, 66, 1364},
{16.60f, 60, 1500},
{20.0f, 50, 4500},
{24.0f, 41, 2160},
{25.0f, 40, 2250},
{30.0f, 33, 2700},
{33.0f, 30, 2790},
@ -6284,6 +6285,7 @@ static int video_get_fps(core_fps_t *fpsP, float fps)
}
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown framerate %f\n", fps);
return 0;
}