fix compiler warnings

Origin commit data
------------------
Branch: master
Commit: cd387592d0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-01-09 (Thu, 09 Jan 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2020-01-09 21:32:07 +01:00
committed by vanhofen
parent 5b15371965
commit f7b8539ee2
5 changed files with 13 additions and 8 deletions

View File

@@ -1772,9 +1772,9 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
if (2 == haveNativeProto) if (2 == haveNativeProto)
{ {
filename = malloc(strlen(baseUri) + 2 + 1); int len = strlen(baseUri) + 2 + 1;
strncpy(filename, "ff", 2); filename = malloc(len);
strcpy(filename + 2, baseUri); snprintf(filename,len,"ff%s",baseUri);
free(baseUri); free(baseUri);
// memory leak, only once, so does not matter // memory leak, only once, so does not matter
} }

View File

@@ -685,7 +685,7 @@ static int ParseParams(int argc, char *argv[], PlayFiles_t *playbackFiles, int *
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
system("echo 'encoder' > /proc/stb/avs/0/input"); int ignored __attribute__((unused)) = system("echo 'encoder' > /proc/stb/avs/0/input");
pthread_t termThread; pthread_t termThread;
int isTermThreadStarted = 0; int isTermThreadStarted = 0;

View File

@@ -193,9 +193,9 @@ static int PlaybackOpen(Context_t *context, PlayFiles_t *pFiles)
if (!strncmp("mms://", uri, 6)) if (!strncmp("mms://", uri, 6))
{ {
// mms is in reality called rtsp, and ffmpeg expects this // mms is in reality called rtsp, and ffmpeg expects this
int len = strlen(uri) + 2;
char *tUri = (char *)malloc(strlen(uri) + 2); char *tUri = (char *)malloc(strlen(uri) + 2);
strncpy(tUri + 1, uri, strlen(uri) + 1); snprintf(tUri,len,"rtsp%s",uri+3);
strncpy(tUri, "rtsp", 4);
free(context->playback->uri); free(context->playback->uri);
context->playback->uri = tUri; context->playback->uri = tUri;
} }

View File

@@ -313,7 +313,9 @@ void GLFramebuffer::run()
ev.type = EV_KEY; ev.type = EV_KEY;
gettimeofday(&ev.time, NULL); gettimeofday(&ev.time, NULL);
hal_debug_c("GLFB::%s: pushing 0x%x\n", __func__, ev.code); hal_debug_c("GLFB::%s: pushing 0x%x\n", __func__, ev.code);
write(glfb_priv->input_fd, &ev, sizeof(ev)); ssize_t w = write(glfb_priv->input_fd, &ev, sizeof(ev));
if(w < 0)
return false;
return true; return true;
} }
@@ -401,6 +403,7 @@ void GLFbPC::render()
zoom = av_q2d(mVA) * av_q2d(a149) / av_q2d(mOA); zoom = av_q2d(mVA) * av_q2d(a149) / av_q2d(mOA);
break; break;
} }
// fall through
/* fallthrough for output format 14:9 */ /* fallthrough for output format 14:9 */
case DISPLAY_AR_MODE_PANSCAN: case DISPLAY_AR_MODE_PANSCAN:
zoom = av_q2d(mOA) / av_q2d(mVA); zoom = av_q2d(mOA) / av_q2d(mVA);

View File

@@ -36,8 +36,10 @@ hw_caps_t *get_hwcaps(void)
caps.display_has_statusline = 0; caps.display_has_statusline = 0;
strcpy(caps.boxvendor, "Generic"); strcpy(caps.boxvendor, "Generic");
strcpy(caps.boxname, "PC"); strcpy(caps.boxname, "PC");
if (! uname(&u)) if (! uname(&u)){
strncpy(caps.boxarch, u.machine, sizeof(caps.boxarch)); strncpy(caps.boxarch, u.machine, sizeof(caps.boxarch));
caps.boxarch[sizeof(caps.boxarch)-1] = '\0';
}
else else
fprintf(stderr, "%s: uname() failed: %m\n", __func__); fprintf(stderr, "%s: uname() failed: %m\n", __func__);