ffmpeg | branch: master | elliottk <elliottk-at-google....@ffmpeg.org> | Sun Sep 15 14:02:50 2019 -0700| [ea673a0edb4b32cab54344faedb41bc3473730eb] | committer: James Zern
Delete unused branch in libaomenc this branch is leftover from libvpxenc+vp8 Signed-off-by: James Zern <jz...@google.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea673a0edb4b32cab54344faedb41bc3473730eb --- libavcodec/libaomenc.c | 14 +++++--------- 1 file 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
