Commit 707cd587 authored by massiot's avatar massiot

* demux.c, en50221.c: Compatibility with gcc 2.95, patch by Marian Ďurkovič.


git-svn-id: svn://svn.videolan.org/dvblast/trunk@47 55d3f8b6-4a41-4d2d-a900-313d1436a5b8
parent ecd768a5
...@@ -749,6 +749,8 @@ static void SendEIT( dvbpsi_psi_section_t *p_section, uint16_t i_sid, ...@@ -749,6 +749,8 @@ static void SendEIT( dvbpsi_psi_section_t *p_section, uint16_t i_sid,
{ {
if ( pp_outputs[i]->i_maddr && pp_outputs[i]->i_sid == i_sid ) if ( pp_outputs[i]->i_maddr && pp_outputs[i]->i_sid == i_sid )
{ {
block_t *p_block;
if( b_unique_tsid ) if( b_unique_tsid )
{ {
p_section->p_data[8] = (pp_outputs[i]->i_ts_id >> 8) & 0xff; p_section->p_data[8] = (pp_outputs[i]->i_ts_id >> 8) & 0xff;
...@@ -757,8 +759,6 @@ static void SendEIT( dvbpsi_psi_section_t *p_section, uint16_t i_sid, ...@@ -757,8 +759,6 @@ static void SendEIT( dvbpsi_psi_section_t *p_section, uint16_t i_sid,
dvbpsi_BuildPSISection( p_section ); dvbpsi_BuildPSISection( p_section );
block_t *p_block;
p_block = WritePSISection( p_section, p_block = WritePSISection( p_section,
EIT_PID, EIT_PID,
&pp_outputs[i]->i_eit_cc ); &pp_outputs[i]->i_eit_cc );
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <poll.h> #include <poll.h>
#include <errno.h> #include <errno.h>
#include <time.h>
/* DVB Card Drivers */ /* DVB Card Drivers */
#include <linux/dvb/version.h> #include <linux/dvb/version.h>
...@@ -1961,6 +1962,7 @@ void en50221_Reset( void ) ...@@ -1961,6 +1962,7 @@ void en50221_Reset( void )
{ {
struct ca_slot_info info; struct ca_slot_info info;
system_ids_t *p_ids; system_ids_t *p_ids;
ca_msg_t ca_msg;
info.num = 0; info.num = 0;
/* We don't reset the CAM in that case because it's done by the /* We don't reset the CAM in that case because it's done by the
...@@ -1991,7 +1993,6 @@ void en50221_Reset( void ) ...@@ -1991,7 +1993,6 @@ void en50221_Reset( void )
/* Get application info to find out which cam we are using and make /* Get application info to find out which cam we are using and make
sure everything is ready to play */ sure everything is ready to play */
ca_msg_t ca_msg;
ca_msg.length=3; ca_msg.length=3;
ca_msg.msg[0] = ( AOT_APPLICATION_INFO & 0xFF0000 ) >> 16; ca_msg.msg[0] = ( AOT_APPLICATION_INFO & 0xFF0000 ) >> 16;
ca_msg.msg[1] = ( AOT_APPLICATION_INFO & 0x00FF00 ) >> 8; ca_msg.msg[1] = ( AOT_APPLICATION_INFO & 0x00FF00 ) >> 8;
......
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