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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue May 25 19:10:07 2010 +0300| [eae71874a95b4b735b5d76aac586f18b67d3008e] | committer: Jean-Baptiste Kempf 

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

Reported by Lotesdelere

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

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 35be318..39d17d3 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1173,11 +1173,17 @@ static int  Open ( vlc_object_t *p_this )
 #if X264_BUILD >= 79
             p_sys->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE;
 #endif
+#if X264_BUILD >= 78
+            p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
+#endif
         }
         else if (!strcasecmp( psz_val, "main" ) )
         {
             msg_Dbg( p_enc, "Limiting to main-profile");
             p_sys->param.analyse.b_transform_8x8 = 0;
+#if X264_BUILD >= 78
+            p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
+#endif
         }
         /* high profile don't restrict stuff*/
     }