diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-01-16 18:40:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-28 12:18:41 +0400 |
| commit | 414e40c353cad08493e90585cd1261297c96570f (patch) | |
| tree | 7a784b5a2a387aaca6faefe5205373f664adad6b /source/blender/imbuf/intern | |
| parent | b7f8bfef2506dfd44d638e2280f00e301823fb2c (diff) | |
libavformat API usage: use avg_frame_rate instead of r_frame_rate
r_frame_rate is a guessed number defined as "the least common multiple of
all framerates in the stream". It has been deprecated and removed in new
Libav releases.
Use avg_frame_rate instead, which is the average framerate of the
stream.
Diffstat (limited to 'source/blender/imbuf/intern')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 8 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/indexer.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 271e52da1d4..a62cb095b1c 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -528,11 +528,11 @@ static int startffmpeg(struct anim *anim) } anim->duration = ceil(pFormatCtx->duration * - av_q2d(pFormatCtx->streams[videoStream]->r_frame_rate) / + av_q2d(pFormatCtx->streams[videoStream]->avg_frame_rate) / AV_TIME_BASE); - frs_num = pFormatCtx->streams[videoStream]->r_frame_rate.num; - frs_den = pFormatCtx->streams[videoStream]->r_frame_rate.den; + frs_num = pFormatCtx->streams[videoStream]->avg_frame_rate.num; + frs_den = pFormatCtx->streams[videoStream]->avg_frame_rate.den; frs_den *= AV_TIME_BASE; @@ -970,7 +970,7 @@ static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position, v_st = anim->pFormatCtx->streams[anim->videoStream]; - frame_rate = av_q2d(v_st->r_frame_rate); + frame_rate = av_q2d(v_st->avg_frame_rate); st_time = anim->pFormatCtx->start_time; pts_time_base = av_q2d(v_st->time_base); diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 3ca22df26c5..807601b4ee0 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->r_frame_rate); + context->frame_rate = av_q2d(context->iStream->avg_frame_rate); context->pts_time_base = av_q2d(context->iStream->time_base); while (av_read_frame(context->iFormatCtx, &next_packet) >= 0) { |