Commit 8ab35810 authored by Jean-Paul Saman's avatar Jean-Paul Saman

ATSC descriptors: fix compilation

parent 4f3cfef2
/* /*
Copyright (C) 2010 Adam Charrett Copyright (C) 2010-2012 Adam Charrett
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
...@@ -24,12 +24,18 @@ Decode Carousel Id Descriptor. ...@@ -24,12 +24,18 @@ Decode Carousel Id Descriptor.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h> #include <stdint.h>
#endif
#include "dvbpsi.h" #include "../dvbpsi.h"
#include "../dvbpsi_private.h" #include "../dvbpsi_private.h"
#include "descriptor.h" #include "../descriptor.h"
#include "dr_13.h" #include "dr_13.h"
...@@ -42,7 +48,7 @@ static dvbpsi_carousel_id_dr_t *NewCarouselDr(const size_t i_private) ...@@ -42,7 +48,7 @@ static dvbpsi_carousel_id_dr_t *NewCarouselDr(const size_t i_private)
calloc(1, sizeof(dvbpsi_carousel_id_dr_t) + i_private); calloc(1, sizeof(dvbpsi_carousel_id_dr_t) + i_private);
if (p_carousel) if (p_carousel)
{ {
p_carousel->p_private_data = p_carousel + sizeof(dvbpsi_carousel_id_dr_t); p_carousel->p_private_data = ((uint8_t *)p_carousel + sizeof(dvbpsi_carousel_id_dr_t));
p_carousel->i_private_data_len = i_private; p_carousel->i_private_data_len = i_private;
} }
return p_carousel; return p_carousel;
......
...@@ -24,12 +24,18 @@ Decode Assocation Tag Descriptor. ...@@ -24,12 +24,18 @@ Decode Assocation Tag Descriptor.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h> #include <stdint.h>
#endif
#include "dvbpsi.h" #include "../dvbpsi.h"
#include "../dvbpsi_private.h" #include "../dvbpsi_private.h"
#include "descriptor.h" #include "../descriptor.h"
#include "dr_14.h" #include "dr_14.h"
...@@ -44,7 +50,7 @@ static dvbpsi_association_tag_dr_t *NewAssociationTagDr(const size_t i_selector, ...@@ -44,7 +50,7 @@ static dvbpsi_association_tag_dr_t *NewAssociationTagDr(const size_t i_selector,
p_tag = (dvbpsi_association_tag_dr_t*) calloc(1, i_size); p_tag = (dvbpsi_association_tag_dr_t*) calloc(1, i_size);
if (p_tag) if (p_tag)
{ {
p_tag->p_selector = p_tag + sizeof(dvbpsi_association_tag_dr_t); p_tag->p_selector = ((uint8_t*)p_tag + sizeof(dvbpsi_association_tag_dr_t));
p_tag->i_selector_len = i_selector; p_tag->i_selector_len = i_selector;
p_tag->p_private_data = p_tag->p_selector + i_selector; p_tag->p_private_data = p_tag->p_selector + i_selector;
......
...@@ -24,16 +24,21 @@ Decode Frequency List Descriptor. ...@@ -24,16 +24,21 @@ Decode Frequency List Descriptor.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h> #include <stdint.h>
#endif
#include "dvbpsi.h" #include "../dvbpsi.h"
#include "../dvbpsi_private.h" #include "../dvbpsi_private.h"
#include "descriptor.h" #include "../descriptor.h"
#include "dr_62.h" #include "dr_62.h"
/***************************************************************************** /*****************************************************************************
* dvbpsi_DecodeFrequencyListDr * dvbpsi_DecodeFrequencyListDr
*****************************************************************************/ *****************************************************************************/
......
...@@ -24,12 +24,18 @@ Decode Data Broadcast Id Descriptor. ...@@ -24,12 +24,18 @@ Decode Data Broadcast Id Descriptor.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h> #include <stdint.h>
#endif
#include "dvbpsi.h" #include "../dvbpsi.h"
#include "../dvbpsi_private.h" #include "../dvbpsi_private.h"
#include "descriptor.h" #include "../descriptor.h"
#include "dr_66.h" #include "dr_66.h"
...@@ -44,7 +50,7 @@ static dvbpsi_data_broadcast_id_dr_t *NewDataBroadcastDr(const size_t i_private) ...@@ -44,7 +50,7 @@ static dvbpsi_data_broadcast_id_dr_t *NewDataBroadcastDr(const size_t i_private)
calloc(1, sizeof(dvbpsi_data_broadcast_id_dr_t) + i_private); calloc(1, sizeof(dvbpsi_data_broadcast_id_dr_t) + i_private);
if (p_bcast) if (p_bcast)
{ {
p_bcast->p_id_selector = p_bcast + sizeof(dvbpsi_data_broadcast_id_dr_t); p_bcast->p_id_selector = ((uint8_t *)p_bcast + sizeof(dvbpsi_data_broadcast_id_dr_t));
p_bcast->i_id_selector_len = i_private; p_bcast->i_id_selector_len = i_private;
} }
return p_bcast; return p_bcast;
......
...@@ -24,12 +24,18 @@ Decode Default Authority Descriptor. ...@@ -24,12 +24,18 @@ Decode Default Authority Descriptor.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h> #include <stdint.h>
#endif
#include "dvbpsi.h" #include "../dvbpsi.h"
#include "../dvbpsi_private.h" #include "../dvbpsi_private.h"
#include "descriptor.h" #include "../descriptor.h"
#include "dr_73.h" #include "dr_73.h"
......
...@@ -24,12 +24,18 @@ Decode Content Identifier Descriptor. ...@@ -24,12 +24,18 @@ Decode Content Identifier Descriptor.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h> #include <stdint.h>
#endif
#include "dvbpsi.h" #include "../dvbpsi.h"
#include "../dvbpsi_private.h" #include "../dvbpsi_private.h"
#include "descriptor.h" #include "../descriptor.h"
#include "dr_76.h" #include "dr_76.h"
......
...@@ -24,12 +24,18 @@ Decode Logical Channel Number Descriptor. ...@@ -24,12 +24,18 @@ Decode Logical Channel Number Descriptor.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h> #include <stdint.h>
#endif
#include "dvbpsi.h" #include "../dvbpsi.h"
#include "../dvbpsi_private.h" #include "../dvbpsi_private.h"
#include "descriptor.h" #include "../descriptor.h"
#include "dr_83.h" #include "dr_83.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment