mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 15:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

get rid of most compiler warnings

Browse Source
This commit is contained in:
martii
2012-10-27 18:08:29 +02:00
committed by Stefan Seyfried
parent e94b7daf85
commit 1cc9619c49
8 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libeplayer3/output/linuxdvb.c
View File

@@ -799,7 +799,11 @@ int LinuxDvbGetFrameCount(Context_t *context, unsigned long long int* frameCoun
linuxdvb_err("VIDEO_GET_PLAY_INFO: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
}
#ifdef MARTII
else linuxdvb_err("V: %llu\n", playInfo.frame_count);
#else
else linuxdvb_err("V: %ull\n", playInfo.frame_count);
#endif
}
else if (audiofd != -1)
{
@@ -809,7 +813,11 @@ int LinuxDvbGetFrameCount(Context_t *context, unsigned long long int* frameCoun
linuxdvb_err("AUDIO_GET_PLAY_INFO: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
}
#ifdef MARTII
else linuxdvb_err("A: %llu\n", playInfo.frame_count);
#else
else linuxdvb_err("A: %ull\n", playInfo.frame_count);
#endif
}
else {
ret = cERR_LINUXDVB_ERROR;

4
libeplayer3/output/output_pipe.c
View File

@@ -277,7 +277,7 @@ int PipeSwitch(Context_t *context, char * type) {
return cERR_PIPE_NO_ERROR;
}
static int writePESDataTeletext(int fd, char *data, size_t data_len)
static int writePESDataTeletext(int fd, unsigned char *data, size_t data_len)
{
int len = 0;
if (data_len > 0) {
@@ -303,7 +303,7 @@ static int writePESDataTeletext(int fd, char *data, size_t data_len)
return len;
}
static int writePESDataDvbsubtitle(int fd, char *data, size_t data_len, int64_t pts)
static int writePESDataDvbsubtitle(int fd, unsigned char *data, size_t data_len, int64_t pts)
{
int len = 0;
if (data_len > 0) {

8
libeplayer3/output/output_subtitle.c
View File

@@ -597,7 +597,11 @@ static int Write(void* _context, void *data) {
return cERR_SUBTITLE_NO_ERROR;
}
#ifdef MARTII
static int subtitle_Open(Context_t* context) {
#else
static int subtitle_Open(context) {
#endif
int i;
subtitle_printf(10, "\n");
@@ -690,7 +694,11 @@ static int subtitle_Play(Context_t* context) {
return cERR_SUBTITLE_NO_ERROR;
}
#ifdef MARTII
static int subtitle_Stop(Context_t* context) {
#else
static int subtitle_Stop(context) {
#endif
int wait_time = 20;
int i;

9
libeplayer3/output/writer/framebuffer.c
View File

@@ -101,13 +101,19 @@ static int reset()
static int writeData(void* _call)
{
#ifndef MARTII
unsigned char r;
unsigned char g;
unsigned char b;
#endif
unsigned char a;
#ifndef MARTII
int x,y;
#endif
int res = 0;
#ifndef MARTII
unsigned char* dst;
#endif
WriterFBCallData_t* call = (WriterFBCallData_t*) _call;
@@ -171,6 +177,9 @@ static int writeData(void* _call)
}
} else
{
#ifdef MARTII
int y;
#endif
for (y = 0; y < call->Height; y++)
memset(call->destination + ((call->y + y) * call->destStride) + call->x * 4, 0, call->Width * 4);
}

2
libeplayer3/output/writer/h264.c
View File

@@ -335,7 +335,9 @@ static int writeData(void* _call)
while (NalLength > 0) {
unsigned int PacketLength = (NalLength < BUFFER_SIZE) ? NalLength : BUFFER_SIZE;
int ExtraLength = 0;
#ifndef MARTII
unsigned char* PacketStart;
#endif
NalLength -= PacketLength;