diff options
| author | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
|---|---|---|
| committer | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
| commit | 2b1ec9c18fadf6b5cd71a7d4122776f5d4b8ac33 (patch) | |
| tree | 01b477f0ea027ab5908f332f6102db6a1d381b76 /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | 5cdd4388ffaad5ade916dba3c18e2bc679e19747 (diff) | |
| parent | e3546a5097b1b30a3c694ce0f6b98c2f7e70510c (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-uv_toolssoc-2016-uv_tools
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 156b74f5c3d..a19e4142894 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -681,6 +681,7 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int /* xasp & yasp got float lately... */ st->sample_aspect_ratio = c->sample_aspect_ratio = av_d2q(((double) rd->xasp / (double) rd->yasp), 255); + st->avg_frame_rate = av_inv_q(c->time_base); set_ffmpeg_properties(rd, c, "video", &opts); |