X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=652774f6cc7b4ade147abc1ca883eb1950c5de9a;hb=cc16229d914aa0eea827599f9df7716bb2afa36b;hp=002705ac2cb1ebe37662513aaf95bcf05ab6c5a3;hpb=9f8a942d6ac9c953664341d5bc37b41c1fbab48b;p=ffmpeg

diff --git a/ffmpeg.c b/ffmpeg.c
index 002705ac2cb..652774f6cc7 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2917,7 +2917,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
@@ -3062,6 +3063,11 @@ static int transcode_init(void)
                 exit_program(1);
 #endif
 
+#if CONFIG_CUVID
+            if (cuvid_transcode_init(ost))
+                exit_program(1);
+#endif
+
             if (!ost->filter &&
                 (enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO ||
                  enc_ctx->codec_type == AVMEDIA_TYPE_AUDIO)) {