[vlc-commits] commit: x264: make sure b-pyramid ain't set other than high-profile ( Ilkka Ollakka )

[git at videolan.org]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue May 25 19:10:07 2010 +0300| [5cc3984f92754e1fd3643039354f8f00c324a90c] | committer: Ilkka Ollakka 

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

Reported by Lotesdelere

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5cc3984f92754e1fd3643039354f8f00c324a90c
---

 modules/codec/x264.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 972597c..e291eaa 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*/
     }