Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:29:56 +0000 (19:29 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:29:56 +0000 (19:29 +0200)
* commit 'e62ff72fc1052273deb708ba715f73e5187281d4':
  lavc: make avcodec_open2() fail when the timebase is not set for encoding

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/utils.c

index 54a3e8708d3aa3f76b5e9901829f75de88d99514..f7adb525f8bbde87afa93ce7a7c66610c5ba792a 100644 (file)
@@ -1412,6 +1412,13 @@ FF_DISABLE_DEPRECATION_WARNINGS
         }
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
+
+        if (avctx->time_base.num <= 0 || avctx->time_base.den <= 0) {
+            av_log(avctx, AV_LOG_ERROR, "The encoder timebase is not set.\n");
+            ret = AVERROR(EINVAL);
+            goto free_and_end;
+        }
+
         if (avctx->codec->sample_fmts) {
             for (i = 0; avctx->codec->sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++) {
                 if (avctx->sample_fmt == avctx->codec->sample_fmts[i])