summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_real.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
commit3119dd2de36dbd8bb9af95ab1826c15f3099b597 (patch)
tree76b0324c6e93b86550e63ad02f1154580ce79526 /src/demuxers/demux_real.c
parent7366cab446742882341e4a5304527e8b1a6965eb (diff)
parentcb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (diff)
downloadxine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.gz
xine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.bz2
Merge.
Diffstat (limited to 'src/demuxers/demux_real.c')
-rw-r--r--src/demuxers/demux_real.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 64422b9ad..47d18018e 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -540,7 +540,7 @@ static void real_parse_headers (demux_real_t *this) {
lprintf("audio version %d detected\n", version);
- char *fourcc_ptr = "\0\0\0";
+ const char *fourcc_ptr = "\0\0\0";
switch(version) {
case 3:
/* Version 3 header stores fourcc after meta info - cheat by reading backwards from the
@@ -1251,7 +1251,7 @@ static int demux_real_send_chunk(demux_plugin_t *this_gen) {
buf->size = 0;
buf->type = this->video_stream->buf_type;
- xine_fast_memcpy(buf->decoder_info_ptr[2], this->fragment_tab,
+ xine_fast_memcpy(buf->content, this->fragment_tab,
this->fragment_count*8);
this->video_fifo->put(this->video_fifo, buf);