From: Ilkka Ollakka <ileoo@videolan.org>
Date: Tue, 25 May 2010 16:10:07 +0000 (+0300)
Subject: x264: make sure b-pyramid ain't set other than high-profile
X-Git-Tag: 1.2.0-pre1~6511
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5cc3984f92754e1fd3643039354f8f00c324a90c;p=vlc

x264: make sure b-pyramid ain't set other than high-profile

Reported by Lotesdelere
---

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 972597ce84..e291eaaa12 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1137,11 +1137,13 @@ static int  Open ( vlc_object_t *p_this )
             p_sys->param.b_cabac = 0;
             p_sys->param.i_bframe = 0;
             p_sys->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE;
+            p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
         }
         else if (!strcasecmp( psz_val, "main" ) )
         {
             msg_Dbg( p_enc, "Limiting to main-profile");
             p_sys->param.analyse.b_transform_8x8 = 0;
+            p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
         }
         /* high profile don't restrict stuff*/
     }