[bTSstream-devel] more fixes for proper cpp inclusion

[Ruslan Mullakhmetov]

bitstream | branch: master | Ruslan Mullakhmetov <theambient at me.com> | Sun Apr  5 13:15:40 2015 +0300| [0eff95b3664fd453ffc8dc0ccfb13b9c927c65d2] | committer: Christophe Massiot

more fixes for proper cpp inclusion

> http://git.videolan.org/gitweb.cgi/bitstream.git/?a=commit;h=0eff95b3664fd453ffc8dc0ccfb13b9c927c65d2
---

 mpeg/psi/desc_04.h |    2 +-
 mpeg/psi/desc_24.h |    8 ++++----
 mpeg/psi/desc_26.h |    2 +-
 mpeg/psi/psi.h     |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mpeg/psi/desc_04.h b/mpeg/psi/desc_04.h
index 14eadfa..c7fe45d 100644
--- a/mpeg/psi/desc_04.h
+++ b/mpeg/psi/desc_04.h
@@ -92,7 +92,7 @@ static inline void desc04_set_channel(uint8_t *p_desc, uint8_t i_channel)
     p_desc[5] = i_channel | 0xc0;
 }
 
-static inline char *desc04_get_type_txt(uint8_t i_type)
+static inline const char *desc04_get_type_txt(uint8_t i_type)
 {
     return i_type == 0 ? "reserved" :
            i_type == 1 ? "Spatial Scalability" :
diff --git a/mpeg/psi/desc_24.h b/mpeg/psi/desc_24.h
index 0eae715..6b76590 100644
--- a/mpeg/psi/desc_24.h
+++ b/mpeg/psi/desc_24.h
@@ -310,8 +310,8 @@ static inline void desc24_print(const uint8_t *p_desc, f_print pf_print,
                  " content_reference_id_record_length=\"%u\""
                  " content_reference_id_record=\"%s\""
                  " content_time_base_indicator=\"%u\""
-                 " content_time_base_value=\"%"PRIu64"\""
-                 " metadata_time_base_value=\"%"PRIu64"\""
+                 " content_time_base_value=\"%" PRIu64 "\""
+                 " metadata_time_base_value=\"%" PRIu64 "\""
                  " content_id=\"%u\""
                  " time_base_association_data_length=\"%u\""
                  " time_base_association_data=\"%s\"/>",
@@ -336,8 +336,8 @@ static inline void desc24_print(const uint8_t *p_desc, f_print pf_print,
                  " content_reference_id_record_length=%u"
                  " content_reference_id_record=\"%s\""
                  " content_time_base_indicator=%u"
-                 " content_time_base_value=\"%"PRIu64"\""
-                 " metadata_time_base_value=\"%"PRIu64"\""
+                 " content_time_base_value=\"%" PRIu64 "\""
+                 " metadata_time_base_value=\"%" PRIu64 "\""
                  " content_id=%u"
                  " time_base_association_data_length=%u"
                  " time_base_association_data=\"%s\"",
diff --git a/mpeg/psi/desc_26.h b/mpeg/psi/desc_26.h
index 1efe8ba..940284c 100644
--- a/mpeg/psi/desc_26.h
+++ b/mpeg/psi/desc_26.h
@@ -235,7 +235,7 @@ static inline void desc26_print(const uint8_t *p_desc, f_print pf_print,
     uint8_t i, i_service_identification_record_length;
     const uint8_t *p_service_identification_record = desc26_get_service_identification_record(p_desc, &i_service_identification_record_length);
     char psz_service_identification_record[2 * 256 + 1];
-    char *extra_str = "decoder_config";
+    const char *extra_str = "decoder_config";
     const uint8_t *p_extra = NULL;
     uint8_t i_extra_length = 0;
     char psz_extra[2 * 256 + 1];
diff --git a/mpeg/psi/psi.h b/mpeg/psi/psi.h
index b661ac4..02e7558 100644
--- a/mpeg/psi/psi.h
+++ b/mpeg/psi/psi.h
@@ -438,7 +438,7 @@ static inline void psi_split_section(uint8_t *p_ts, uint8_t *pi_ts_offset,
 
 static inline uint8_t **psi_table_allocate(void)
 {
-    return (uint8_t *)malloc(PSI_TABLE_MAX_SECTIONS * sizeof(uint8_t *));
+    return (uint8_t **)malloc(PSI_TABLE_MAX_SECTIONS * sizeof(uint8_t *));
 }
 
 static inline void psi_table_init(uint8_t **pp_sections)