X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Ffourcc.c;h=34a931d5b501d404025486f030225c32bcae359b;hb=7f42234cabfde2f61ced5694eb9e09ea49c40987;hp=95e3bc0e0b5e0c04fc81e5c5479f0dbb25fde2f9;hpb=376853e5d685a9dde50acbdc2524fa5d890aed83;p=vlc

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 95e3bc0e0b..34a931d5b5 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -443,6 +443,7 @@ static const entry_t p_list_video[] = {
 
     B(VLC_CODEC_VP6F, "On2's VP6.2 Video (Flash)"),
         A("VP6F"),
+        A("FLV4"),
 
     B(VLC_CODEC_VP6A, "On2's VP6 A Video"),
         A("VP6A"),
@@ -699,6 +700,9 @@ static const entry_t p_list_video[] = {
     B(VLC_CODEC_V210, "10-bit 4:2:2 Component YCbCr"),
         A("v210"),
 
+    B(VLC_CODEC_NV12, "Planar  Y, Packet UV (420)"),
+        A("NV12"),
+
     /* Videogames Codecs */
 
     /* Interplay MVE */
@@ -875,6 +879,10 @@ static const entry_t p_list_audio[] = {
         A("mp4a"),
         A("aac "),
 
+    /* ALS audio */
+    B(VLC_CODEC_ALS, "MPEG-4 Audio Lossless (ALS)"),
+        A("als "),
+
     /* 4X Technologies */
     B(VLC_CODEC_ADPCM_4XM, "4X Technologies Audio"),
         A("4xma"),
@@ -1193,7 +1201,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;
         }
     }