[vlc-commits] mux/asf: syntax error

Rémi Denis-Courmont git at videolan.org
Wed Aug 29 16:35:00 CEST 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 29 17:29:21 2018 +0300| [f912a656ce53c68be826cac5c7af46ec01ded930] | committer: Rémi Denis-Courmont

mux/asf: syntax error

Regression from 7b452ff3b0b1cc376e13c8766dcae3e2c383aa88.

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

 modules/mux/asf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index f236651a4c..e611befe50 100644
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -561,7 +561,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             else
             {
                 tk->psz_name = _("Unknown Video");
-                tk->i_fourcc = p_fmt->i_original_fourcc ?: p_fmt->i_codec;
+                tk->i_fourcc = p_fmt->i_original_fourcc ? p_fmt->i_original_fourcc : p_fmt->i_codec;
             }
             if( !i_codec_extra && p_fmt->i_extra > 0 )
             {



More information about the vlc-commits mailing list