diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 14:58:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 14:58:28 +0100 |
| commit | e53ec2fe3829af4a76b61cd369d8a80da74b93ff (patch) | |
| tree | deb074ea989cfa23cdc436059dd7dce32dfdb506 | |
| parent | dd4237f87d84ad2ea9749dc9b2e724acaa04d16d (diff) | |
| parent | 78987a88a88b28d93d03ed6c228bcb33f178444f (diff) | |
Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'
* commit '78987a88a88b28d93d03ed6c228bcb33f178444f':
lavf: include 60 fps in guessed standard frame rates
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 743d6f4081..30e1463368 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3243,7 +3243,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) /* Round guessed framerate to a "standard" framerate if it's * 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 }; double error = fabs(av_q2d(st->avg_frame_rate) / av_q2d(std_fps) - 1); |