[vlc-commits] x264: Enable non stereoscopic frame packing mode

[Vittorio Giovara]

vlc | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Sat Sep 24 22:34:51 2016 -0400| [37b9443c2fb765479803f710fe14d02f142e4359] | committer: Vittorio Giovara

x264: Enable non stereoscopic frame packing mode

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

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 2b77d8a..27d9bc0 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -443,9 +443,9 @@ static const char *const direct_pred_list_text[] =
   { N_("None"), N_("Spatial"), N_("Temporal"), N_("Auto") };
 
 static const int framepacking_list[] =
-  { -1, 0, 1, 2, 3, 4, 5 };
+  { -1, 0, 1, 2, 3, 4, 5, 6 };
 static const char *const framepacking_list_text[] =
-  { "", N_("checkerboard"), N_("column alternation"), N_("row alternation"), N_("side by side"), N_("top bottom"), N_("frame alternation") };
+  { "", N_("checkerboard"), N_("column alternation"), N_("row alternation"), N_("side by side"), N_("top bottom"), N_("frame alternation"), N_("2D") };
 
 vlc_module_begin ()
 #ifdef MODULE_NAME_IS_x26410b
@@ -547,7 +547,7 @@ vlc_module_begin ()
 #if X264_BUILD >= 111
     add_integer( SOUT_CFG_PREFIX "frame-packing", -1, FRAMEPACKING_TEXT, FRAMEPACKING_LONGTEXT, true )
         change_integer_list( framepacking_list, framepacking_list_text )
-        change_integer_range( -1, 5)
+        change_integer_range( -1, 6)
 #endif
 
     add_integer( SOUT_CFG_PREFIX "slices", 0, SLICE_COUNT, SLICE_COUNT_LONGTEXT, true )