summaryrefslogtreecommitdiff
path: root/libavcodec/libaomenc.c
diff options
context:
space:
mode:
authorelliottk <elliottk-at-google.com@ffmpeg.org>2019-09-15 14:02:50 -0700
committerJames Zern <jzern@google.com>2019-09-19 23:56:03 -0700
commitea673a0edb4b32cab54344faedb41bc3473730eb (patch)
treeef1f629ac7102bd0bd390d9999efd9ddebecf892 /libavcodec/libaomenc.c
parentecd026a48d63166d97f074f072d36ade1b5d270b (diff)
Delete unused branch in libaomenc
this branch is leftover from libvpxenc+vp8 Signed-off-by: James Zern <jzern@google.com>
Diffstat (limited to 'libavcodec/libaomenc.c')
-rw-r--r--libavcodec/libaomenc.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index 7f47707a09..e06697c1bf 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -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)