[vlc-commits] commit: fix unsupported compact ifelse syntax (Francois Cartegnie )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Apr 15 21:57:28 2010 +0200| [17320bcd3bc32657c8e3d45feb120e46b49cb80a] | committer: Jean-Baptiste Kempf 

fix unsupported compact ifelse syntax

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 807b0ab6dcaeaf63135a24eb35f892ea2ac619c6)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 src/misc/fourcc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index eecebe4..5ad47f6 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1197,7 +1197,8 @@ static entry_t Lookup( const entry_t p_list[], vlc_fourcc_t i_fourcc )
 
             memcpy( e.p_class, p_class, 4 );
             memcpy( e.p_fourcc, p->p_fourcc, 4 );
-            e.psz_description = p->psz_description ?: psz_description;
+            e.psz_description = p->psz_description ?
+                                p->psz_description : psz_description;
             break;
         }
     }