From: Ilkka Ollakka <ileoo@videolan.org>
Date: Sat, 5 Jun 2010 20:18:08 +0000 (+0300)
Subject: avcodec: fix vp8 default to check height for 720p
X-Git-Tag: 1.2.0-pre1~6294
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=16ea0e630bc4cb792c132ff15d3d6a1f8a5e5f06;p=vlc

avcodec: fix vp8 default to check height for 720p

also fix sub 720p defaults
---

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 90e76e6586..092dfee32f 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -606,7 +606,7 @@ int OpenEncoder( vlc_object_t *p_this )
         if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "keyint" ) )
            p_context->gop_size = 120;
         /* seems that ffmpeg presets have 720p as divider for buffers */
-        if( p_enc->fmt_out.video.i_width >= 720 )
+        if( p_enc->fmt_out.video.i_height >= 720 )
         {
            /* Check that we don't overrun users qmin/qmax values */
            if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
@@ -626,7 +626,7 @@ int OpenEncoder( vlc_object_t *p_this )
         } else {
            if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
            {
-              p_context->mb_qmin = p_context->qmin = FF_QP2LAMBDA;
+              p_context->mb_qmin = p_context->qmin = 1;
               p_context->mb_lmin = p_context->lmin = FF_QP2LAMBDA;
            }