Skip to content

Clean up compiler warnings except fallthrough #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yum-food wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clean up compiler warnings except fallthrough #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions minimp4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,16 +859,6 @@ int MP4E_add_track(MP4E_mux_t *mux, const MP4E_track_t *track_data)
return ntr;
}

static const unsigned char *next_dsi(const unsigned char *p, const unsigned char *end, int *bytes)
{
if (p < end + 2)
{
*bytes = p[0]*256 + p[1];
return p + 2;
} else
return NULL;
}

static int append_mem(minimp4_vector_t *v, const void *mem, int bytes)
{
int i;
Expand Down Expand Up @@ -944,7 +934,7 @@ static unsigned get_duration(const track_t *tr)
static int write_pending_data(MP4E_mux_t *mux, track_t *tr)
{
// if have pending sample && have at least one sample in the index
if (tr->pending_sample.bytes > 0 && tr->smpl.bytes >= sizeof(sample_t))
if (tr->pending_sample.bytes > 0 && tr->smpl.bytes >= (int) sizeof(sample_t))
{
// Complete pending sample
sample_t *smpl_desc;
Expand Down Expand Up @@ -1004,7 +994,7 @@ static int mp4e_write_fragment_header(MP4E_mux_t *mux, int track_num, int data_b
{
default_sample_duration_present = 0x000008,
default_sample_flags_present = 0x000020,
} e;
};

track_t *tr = ((track_t*)mux->tracks.data) + track_num;

Expand Down Expand Up @@ -1134,7 +1124,7 @@ int MP4E_put_sample(MP4E_mux_t *mux, int track_num, const void *data, int data_b
if (!mux->sequential_mode_flag)
{
sample_t *smpl_desc;
if (tr->smpl.bytes < sizeof(sample_t))
if (tr->smpl.bytes < (int) sizeof(sample_t))
return MP4E_STATUS_NO_MEMORY; // write continuation, but there are no samples in the index
// Accumulate size of the continuation in the sample descriptor
smpl_desc = (sample_t*)(tr->smpl.data + tr->smpl.bytes) - 1;
Expand Down Expand Up @@ -3181,7 +3171,7 @@ int MP4D_open(MP4D_demux_t *mp4, int (*read_callback)(int64_t offset, void *buff
// if box is not envelope, just skip it
if (i == NELEM(g_envelope_box))
{
if (payload_bytes > file_size)
if ((int) payload_bytes > file_size)
{
eof_flag = 1;
} else
Expand Down