[vlc-commits] fourcc: simplify

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 11 23:24:04 2015 +0300| [8d1bc6626f26a49a9088a4801dce62cb3dba7035] | committer: Rémi Denis-Courmont

fourcc: simplify

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

 src/misc/fourcc_gen.c  |    3 ---
 src/misc/fourcc_list.h |    6 ------
 2 files changed, 9 deletions(-)

diff --git a/src/misc/fourcc_gen.c b/src/misc/fourcc_gen.c
index d8903ac..4f98a4d 100644
--- a/src/misc/fourcc_gen.c
+++ b/src/misc/fourcc_gen.c
@@ -63,9 +63,6 @@ static int cmp_entry(const void *a, const void *b)
 
 static void process_list(const char *name, const staticentry_t *list, size_t n)
 {
-    assert(n > 0);
-    n--; /* discard final nul entry  */
-
     struct entry *entries = malloc(sizeof (*entries) * n);
     if (entries == NULL)
         abort();
diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index 42513c2..214a2a7 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -1075,8 +1075,6 @@ static const staticentry_t p_list_video[] = {
     B(VLC_CODEC_DFA, "Chronomaster DFA"),
 
     B(VLC_CODEC_HNM4_VIDEO, "Cryo Interactive Entertainment HNM4"),
-
-    B(VLC_FOURCC(0,0,0,0), "")
 };
 
 static const staticentry_t p_list_audio[] = {
@@ -1482,8 +1480,6 @@ static const staticentry_t p_list_audio[] = {
     B(VLC_CODEC_ADPCM_EA_R1, "ADPCM Electronic Arts R1"),
 
     B(VLC_CODEC_ADPCM_IMA_APC, "ADPCM APC"),
-
-    B(VLC_FOURCC(0,0,0,0), "")
 };
 
 static const staticentry_t p_list_spu[] = {
@@ -1554,6 +1550,4 @@ static const staticentry_t p_list_spu[] = {
 
     B(VLC_CODEC_TTML, "TTML subtitles"),
         A("ttml"),
-
-    B(VLC_FOURCC(0,0,0,0), "")
 };