aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2012-04-09 18:56:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-21 12:04:47 +0200
commit6d887ecac2ed2997d579260c62ee1ce4ca5e55c5 (patch)
tree36a0face7648f839b2451210a650e9250981237d /libavformat/utils.c
parent2d61f0040da16650d2da77c453189e5084453062 (diff)
downloadffmpeg-6d887ecac2ed2997d579260c62ee1ce4ca5e55c5.tar.gz
avformat: add 48 fps to the NTSC framerates
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
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;
}
/*