[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: x264: fix wrong h264 option longtext

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
1a121dd8 by Lyndon Brown at 2021-06-15T23:54:41+01:00
x264: fix wrong h264 option longtext

This option should be using DEADZONE_INTER_LONGTEXT instead of
DEADZONE_INTRA_LONGTEXT.

(cherry picked from commit 50e2350110042ccf2b88652418af0a953fbfca55)

- - - - -
f07984b8 by Lyndon Brown at 2021-06-15T23:54:41+01:00
gnutls: fix --gnutls-dir-trust longtext

was mistakenly using shorttext instead of the defined longtext.

(cherry picked from commit a0a7666095c4965616bb44111685e796ab27ec64)

- - - - -


2 changed files:

- modules/codec/x264.c
- modules/misc/gnutls.c


Changes:

=====================================
modules/codec/x264.c
=====================================
@@ -681,7 +681,7 @@ vlc_module_begin ()
         change_integer_range( 0, 1000 )
 
     add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, DEADZONE_INTER_TEXT,
-                 DEADZONE_INTRA_LONGTEXT, true )
+                 DEADZONE_INTER_LONGTEXT, true )
         change_integer_range( 0, 32 )
 
     add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, DEADZONE_INTRA_TEXT,


=====================================
modules/misc/gnutls.c
=====================================
@@ -790,7 +790,7 @@ vlc_module_begin ()
     add_bool("gnutls-system-trust", true, SYSTEM_TRUST_TEXT,
              SYSTEM_TRUST_LONGTEXT, true)
     add_string("gnutls-dir-trust", NULL, DIR_TRUST_TEXT,
-               DIR_TRUST_TEXT, true)
+               DIR_TRUST_LONGTEXT, true)
     add_string ("gnutls-priorities", "NORMAL", PRIORITIES_TEXT,
                 PRIORITIES_LONGTEXT, false)
         change_string_list (priorities_values, priorities_text)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fafe8f236d1bf10d5cdc913c5ef29db2e35d9593...f07984b8a938bd242787e9d77ab70f50a7abcd66

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fafe8f236d1bf10d5cdc913c5ef29db2e35d9593...f07984b8a938bd242787e9d77ab70f50a7abcd66
You're receiving this email because of your account on code.videolan.org.