From 9770d071ff4306ccec940d1f44169297bb3f5747 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 23 Jan 2019 17:15:56 +0100 Subject: Fix T54834: VSE can't import OGG Theora video --- intern/ffmpeg/ffmpeg_compat.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'intern/ffmpeg') diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index bc65f19ef59..47d20113190 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -520,6 +520,14 @@ AVRational av_get_r_frame_rate_compat(AVFormatContext *ctx, /* For until r_frame_rate was deprecated use it. */ return stream->r_frame_rate; #else +# ifdef AV_USING_FFMPEG + /* Some of the videos might have average frame rate set to, while the + * r_frame_rate will show a correct value. This happens, for example, for + * OGG video files saved with Blender. */ + if (stream->avg_frame_rate.den == 0) { + return stream->r_frame_rate; + } +# endif return stream->avg_frame_rate; #endif } -- cgit v1.2.3