diff options
author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-01-29 18:44:43 +0100 |
---|---|---|
committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-01-29 18:44:43 +0100 |
commit | 94e8b362ac4afccd9840930bc661fe02cb36ffac (patch) | |
tree | fc4304594734bfdbbc54b713b2a3cf761cc864a7 /src | |
parent | a4000bbd9fe488cd914636ce9c7a79157d7bf620 (diff) | |
download | advtime-94e8b362ac4afccd9840930bc661fe02cb36ffac.tar.gz advtime-94e8b362ac4afccd9840930bc661fe02cb36ffac.tar.bz2 advtime-94e8b362ac4afccd9840930bc661fe02cb36ffac.zip |
Fix warnings
Diffstat (limited to 'src')
-rw-r--r-- | src/advtime.c | 4 | ||||
-rw-r--r-- | src/video_decode.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/advtime.c b/src/advtime.c index 581cee7..15fbcb7 100644 --- a/src/advtime.c +++ b/src/advtime.c @@ -85,7 +85,7 @@ int main(int argc, char **argv) { struct video_decode *vd; - struct video_frame *frame_a = NULL, *frame_b = NULL, *tmp; + struct video_frame *frame_a = NULL, *frame_b = NULL; int ret, ch; int diff_flag = 0, average_flag = 0, frame_flag = 0, showcut_flag = 0; int64_t timestamp = 0; @@ -190,7 +190,7 @@ main(int argc, char **argv) fflush(stdout); } - pswap(&frame_a, &frame_b); + pswap((void **)&frame_a, (void **)&frame_b); } video_decode_free_frame(&frame_a); diff --git a/src/video_decode.c b/src/video_decode.c index e6748e0..defb6d7 100644 --- a/src/video_decode.c +++ b/src/video_decode.c @@ -98,7 +98,7 @@ video_decode_get_frame(struct video_decode *vd, struct video_frame **frame) int ret; if (*frame != NULL) { - f = *frame; + f = (struct video_frame_priv *) *frame; } else { f = calloc(1, sizeof *f); if (f == NULL) |