Commit 2039b3e7 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat: Add integer fps from 31 to 60 to get_std_framerate()

Fixes Ticket 5106
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent ba4c2917
......@@ -990,7 +990,7 @@ typedef struct AVStream {
/**
* Stream information used internally by av_find_stream_info()
*/
#define MAX_STD_TIMEBASES (30*12+7+6)
#define MAX_STD_TIMEBASES (30*12+30+3+6)
struct {
int64_t last_dts;
int64_t duration_gcd;
......
......@@ -2927,10 +2927,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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment