Commit 6d887eca authored by Hendrik Leppkes's avatar Hendrik Leppkes Committed by Michael Niedermayer

avformat: add 48 fps to the NTSC framerates

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 2d61f004
......@@ -726,7 +726,7 @@ typedef struct AVStream {
/**
* Stream information used internally by av_find_stream_info()
*/
#define MAX_STD_TIMEBASES (60*12+5)
#define MAX_STD_TIMEBASES (60*12+6)
struct {
int64_t last_dts;
int64_t duration_gcd;
......
......@@ -2422,7 +2422,7 @@ static void compute_chapters_end(AVFormatContext *s)
static int get_std_framerate(int i){
if(i<60*12) return i*1001;
else return ((const int[]){24,30,60,12,15})[i-60*12]*1000*12;
else return ((const int[]){24,30,60,12,15,48})[i-60*12]*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