x264: allow b-pyramid in main-profile selection

5cc3984f92754e1fd3643039354f8f00c324a90c was too strict, and for baseline it
should be only cosmetic change.

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 507244670125d919b26ca8d14d7317b0a8d0403d..029ee5b56b37dbb25d1f392f56c172f1b717e122 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1151,7 +1151,6 @@ static int  Open ( vlc_object_t *p_this )
         {
             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*/
     }