[FFmpeg-cvslog] r23521 - trunk/libavcodec/libvpxenc.c

[mstorsjo]

Author: mstorsjo
Date: Tue Jun  8 10:47:50 2010
New Revision: 23521

Log:
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

Modified:
   trunk/libavcodec/libvpxenc.c

Modified: trunk/libavcodec/libvpxenc.c
==============================================================================
--- trunk/libavcodec/libvpxenc.c	Tue Jun  8 04:02:16 2010	(r23520)
+++ trunk/libavcodec/libvpxenc.c	Tue Jun  8 10:47:50 2010	(r23521)
@@ -241,10 +241,8 @@ static av_cold int vp8_init(AVCodecConte
     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;