Added picture_pool_GetSize helper.

[vlc] / src / misc / fourcc.c

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 461eee0f75fb521387bf785df0d95737b5383a8c..82545fd8a48152699c0d2f7deeee1e55f62cc245 100644 (file)
--- 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"),
@@ -875,6 +876,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"),
@@ -927,6 +932,7 @@ static const entry_t p_list_audio[] = {
         A("ms\x00\x11"),
 
     B(VLC_CODEC_ADPCM_IMA_AMV, "IMA AMV ADPCM Audio"),
+        A("imav"),
 
     /* AMR */
     B(VLC_CODEC_AMR_NB, "AMR narrow band"),
@@ -1192,7 +1198,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;
         }
     }