diff options
| author | Michael Niedermayer <[email protected]> | 2016-05-16 12:49:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2017-08-23 13:15:16 +0200 |
| commit | 8d257c3680a9b1060ab1834df2ce498266f658eb (patch) | |
| tree | a7d9772b2a6a35b97684aa70d0beb5bf9f18c192 | |
| parent | da88b6d118afe10aa96fe8ba22fd210145cf5765 (diff) | |
ffmpeg: Check that r_frame_rate is set before attempting to use it
Avoids unexpected occurance and dependency on NaN behavior and divisions by 0
Testcase: fate-lavf-fate-avi_cram
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 6085d6b2aeef28671614f625601a23cfc922d282)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2592,7 +2592,8 @@ static int transcode_init(void) * overhead */ if(!strcmp(oc->oformat->name, "avi")) { - if ( copy_tb<0 && av_q2d(ist->st->r_frame_rate) >= av_q2d(ist->st->avg_frame_rate) + if ( copy_tb<0 && ist->st->r_frame_rate.num + && av_q2d(ist->st->r_frame_rate) >= av_q2d(ist->st->avg_frame_rate) && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(ist->st->time_base) && 0.5/av_q2d(ist->st->r_frame_rate) > av_q2d(dec_ctx->time_base) && av_q2d(ist->st->time_base) < 1.0/500 && av_q2d(dec_ctx->time_base) < 1.0/500 |