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

Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'

Browse Source 
* commit '78987a88a88b28d93d03ed6c228bcb33f178444f':
  lavf: include 60 fps in guessed standard frame rates

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-31 14:58:22 +01:00
parent dd4237f87d 78987a88a8
commit e53ec2fe38
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/utils.c
View File

@@ -3243,7 +3243,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
/* Round guessed framerate to a "standard" framerate if it's /* Round guessed framerate to a "standard" framerate if it's
* within 1% of the original estimate. */ * within 1% of the original estimate. */
for (j = 1; j < MAX_STD_TIMEBASES; j++) { for (j = 0; j < MAX_STD_TIMEBASES; j++) {
AVRational std_fps = { get_std_framerate(j), 12 * 1001 }; AVRational std_fps = { get_std_framerate(j), 12 * 1001 };
double error = fabs(av_q2d(st->avg_frame_rate) / double error = fabs(av_q2d(st->avg_frame_rate) /
av_q2d(std_fps) - 1); av_q2d(std_fps) - 1);