generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat: add 48 fps to the NTSC framerates

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Hendrik Leppkes
2012-04-09 18:56:46 +02:00
committed by Michael Niedermayer
parent 2d61f0040d
commit 6d887ecac2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@@ -726,7 +726,7 @@ typedef struct AVStream {
/** /**
* Stream information used internally by av_find_stream_info() * Stream information used internally by av_find_stream_info()
*/ */
#define MAX_STD_TIMEBASES (60*12+5) #define MAX_STD_TIMEBASES (60*12+6)
struct { struct {
int64_t last_dts; int64_t last_dts;
int64_t duration_gcd; int64_t duration_gcd;

2
libavformat/utils.c
View File

@@ -2422,7 +2422,7 @@ static void compute_chapters_end(AVFormatContext *s)
static int get_std_framerate(int i){ static int get_std_framerate(int i){
if(i<60*12) return i*1001; 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;
} }
/* /*