diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-04-09 18:56:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-21 12:04:47 +0200 |
| commit | 6d887ecac2ed2997d579260c62ee1ce4ca5e55c5 (patch) | |
| tree | 36a0face7648f839b2451210a650e9250981237d | |
| parent | 2d61f0040da16650d2da77c453189e5084453062 (diff) | |
| download | ffmpeg-6d887ecac2ed2997d579260c62ee1ce4ca5e55c5.tar.gz | |
avformat: add 48 fps to the NTSC framerates
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index df684ca628..efab990f16 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -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; diff --git a/libavformat/utils.c b/libavformat/utils.c index deac84a4f8..8d82f9e37a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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; } /* |