diff options
| author | Rudolf Polzer <divverent@xonotic.org> | 2012-12-28 08:38:18 +0100 |
|---|---|---|
| committer | Rudolf Polzer <divverent@xonotic.org> | 2012-12-28 08:40:40 +0100 |
| commit | 671ca2a570ed030a2d18c63d2090f0571355dc3d (patch) | |
| tree | 831fca4886c14008055d1ce74ee11a823686c454 /demux | |
| parent | c3cc38e4c40d23178330e035c8befc0443a2868b (diff) | |
| download | mpv-671ca2a570ed030a2d18c63d2090f0571355dc3d.tar.bz2 mpv-671ca2a570ed030a2d18c63d2090f0571355dc3d.tar.xz | |
demux_mpg, ass_mp: fix warnings
The warnings in demux_mpg were silenced by additional no-operation
casts.
A variable in ass_mp was used only for some versions of libass; now the
declaration is in that version #ifdef too to avoid a compiler warning.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_mpg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_mpg.c b/demux/demux_mpg.c index 83d27def11..4223a33c92 100644 --- a/demux/demux_mpg.c +++ b/demux/demux_mpg.c @@ -844,7 +844,7 @@ static int demux_mpg_gxf_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { return 0; } { - register uint32_t state = (uint32_t)demux->priv; + register uint32_t state = (uint32_t)(uintptr_t)demux->priv; register int pos = -len; unsigned char *buf = &pack->buffer[len]; do { @@ -852,7 +852,7 @@ static int demux_mpg_gxf_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { if (unlikely((state | 3) == 0x1bf)) pos = find_end(&buf, pos, demux->stream); } while (++pos < 0); - demux->priv = (void *)state; + demux->priv = (void *)(uintptr_t)state; len = buf - pack->buffer; } if (len < STREAM_BUFFER_SIZE) |