aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2010-06-08 08:47:50 +0000
committerMartin Storsjö <martin@martin.st>2010-06-08 08:47:50 +0000
commit07777c2d5c1a87e5c6814f4c9d9de6dee5c7ff3c (patch)
tree8fc133dfabb8e8332826ef2f68852518b88f53a8 /libavcodec
parentbc330b5f1566510f1cdc4be78dd3b127aba2b6b1 (diff)
downloadffmpeg-07777c2d5c1a87e5c6814f4c9d9de6dee5c7ff3c.tar.gz
libvpx: Don't use the VPX_KF_FIXED mode
This mode emits no keyframes at all, despite its name. Patch by James Zern, jzern at google dot com Originally committed as revision 23521 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/libvpxenc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index e3fc333972..c073ebf98b 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -241,10 +241,8 @@ static av_cold int vp8_init(AVCodecContext *avctx)
enccfg.rc_min_quantizer = ((avctx->qmin * 5 + 1) >> 2) - 1;
enccfg.rc_max_quantizer = ((avctx->qmax * 5 + 1) >> 2) - 1;
+ //_enc_init() will balk if kf_min_dist differs from max w/VPX_KF_AUTO
if (avctx->keyint_min == avctx->gop_size)
- enccfg.kf_mode = VPX_KF_FIXED;
- //_enc_init() will balk if kf_min_dist is set in this case
- if (enccfg.kf_mode != VPX_KF_AUTO)
enccfg.kf_min_dist = avctx->keyint_min;
enccfg.kf_max_dist = avctx->gop_size;