openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 19:59:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavf: include 60 fps in guessed standard frame rates

Browse Source 
Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001
is not tested as standard frame rate in avformat_find_stream_info().
This commit is contained in:
Janne Grunau 2014-01-29 15:12:48 +01:00
parent 5312818524
commit 78987a88a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/utils.c
View File

@ -2175,7 +2175,7 @@ static void compute_chapters_end(AVFormatContext *s)
static int get_std_framerate(int i)
{
if (i < 60 * 12)
return i * 1001;
return (i + 1) * 1001;
else
return ((const int[]) { 24, 30, 60, 12, 15 })[i - 60 * 12] * 1000 * 12;
}
@ -2458,7 +2458,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);