From 671ca2a570ed030a2d18c63d2090f0571355dc3d Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 28 Dec 2012 08:38:18 +0100 Subject: 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. --- demux/demux_mpg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux') 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) -- cgit v1.2.3