diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-09 10:49:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 16:00:31 +0100 |
| commit | 2316c3586591f858ad14f586bb30a54700dd266e (patch) | |
| tree | bb318216db8606d6d0885d1c2c1f004de3da4ef9 /libavformat/utils.c | |
| parent | 3dd0d43d8cf7970a141c8f76fa8ec3d81d65be82 (diff) | |
| download | ffmpeg-2316c3586591f858ad14f586bb30a54700dd266e.tar.gz | |
avformat: Add integer fps from 31 to 60 to get_std_framerate()
Fixes Ticket 5106
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2039b3e7511ef183dae206575114e15b6d99c134)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 47d07071b7..d5e65814ef 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2832,10 +2832,14 @@ static int get_std_framerate(int i) return (i + 1) * 1001; i -= 30*12; - if (i < 7) - return ((const int[]) { 40, 48, 50, 60, 80, 120, 240})[i] * 1001 * 12; + if (i < 30) + return (i + 31) * 1001 * 12; + i -= 30; - i -= 7; + if (i < 3) + return ((const int[]) { 80, 120, 240})[i] * 1001 * 12; + + i -= 3; return ((const int[]) { 24, 30, 60, 12, 15, 48 })[i] * 1000 * 12; } |