]> git.sesse.net Git - ffmpeg/commitdiff
Delete unused branch in libaomenc
authorelliottk <elliottk-at-google.com@ffmpeg.org>
Sun, 15 Sep 2019 21:02:50 +0000 (14:02 -0700)
committerJames Zern <jzern@google.com>
Fri, 20 Sep 2019 06:56:03 +0000 (23:56 -0700)
this branch is leftover from libvpxenc+vp8

Signed-off-by: James Zern <jzern@google.com>
libavcodec/libaomenc.c

index 7f47707a097ccfa010568ebb4bf9625efcebaa9b..e06697c1bff5f4e27420bdbba201fa81178673ba 100644 (file)
@@ -572,15 +572,11 @@ static av_cold int aom_init(AVCodecContext *avctx,
         enccfg.rc_target_bitrate = av_rescale_rnd(avctx->bit_rate, 1, 1000,
                                                   AV_ROUND_NEAR_INF);
     } else if (enccfg.rc_end_usage != AOM_Q) {
-        if (enccfg.rc_end_usage == AOM_CQ) {
-            enccfg.rc_target_bitrate = 1000000;
-        } else {
-            enccfg.rc_end_usage = AOM_Q;
-            ctx->crf = 32;
-            av_log(avctx, AV_LOG_WARNING,
-                   "Neither bitrate nor constrained quality specified, using default CRF of %d\n",
-                   ctx->crf);
-        }
+        enccfg.rc_end_usage = AOM_Q;
+        ctx->crf = 32;
+        av_log(avctx, AV_LOG_WARNING,
+               "Neither bitrate nor constrained quality specified, using default CRF of %d\n",
+               ctx->crf);
     }
 
     if (avctx->qmin >= 0)