summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_film.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-05-04 22:12:55 +0200
committerUoti Urpala <uau@mplayer2.org>2011-05-06 18:33:16 +0300
commitb68f9fef32971095836ea6bbeb2f12af417120d2 (patch)
tree46288d0356764318d595a946d22ca31eaf6b0101 /libmpdemux/demux_film.c
parent40f6ab5064a628dc11b79b5e571dc9444efac093 (diff)
downloadmpv-b68f9fef32971095836ea6bbeb2f12af417120d2.tar.bz2
mpv-b68f9fef32971095836ea6bbeb2f12af417120d2.tar.xz
cleanup: shut up more warnings
Diffstat (limited to 'libmpdemux/demux_film.c')
-rw-r--r--libmpdemux/demux_film.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c
index c720e85887..8575d5f1e8 100644
--- a/libmpdemux/demux_film.c
+++ b/libmpdemux/demux_film.c
@@ -158,7 +158,7 @@ static int demux_film_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
memcpy( tmp, buf, film_chunk.chunk_size );
}
else {/* for 16bit */
- unsigned short* tmp = dp->buffer;
+ unsigned short *tmp = (unsigned short *)dp->buffer;
unsigned short buf[film_chunk.chunk_size/2];
for(i = 0; i < film_chunk.chunk_size/4; i++) {
buf[i*2] = tmp[i];