diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-03 15:24:25 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-03 15:25:47 +0400 |
| commit | 9bec4f777973c066ac12ae5ad2df107be23bdc7b (patch) | |
| tree | 22e81bf056a0540936a5666cc9e36fd7a1dd4ecd /source/blender/imbuf/intern/indexer.c | |
| parent | 15f449c52909d5275feb23d814988ded3369ba62 (diff) | |
Fix T38455: Blenderplayer is not working
Was a regression since avg_frame_rate changes.
Didn't find reliable way to get stream duration which will
work with both FFmpeg and Libav so added some freaking black
magic to distinguish one from another.
Diffstat (limited to 'source/blender/imbuf/intern/indexer.c')
| -rw-r--r-- | source/blender/imbuf/intern/indexer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index a3cb4048779..e45222706d7 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -910,7 +910,7 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context, stream_size = avio_size(context->iFormatCtx->pb); - context->frame_rate = av_q2d(context->iStream->avg_frame_rate); + context->frame_rate = av_q2d(av_get_r_frame_rate_compat(context->iStream)); context->pts_time_base = av_q2d(context->iStream->time_base); while (av_read_frame(context->iFormatCtx, &next_packet) >= 0) { |