summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2012-01-12 15:02:56 +0200
committerPetri Hintukainen <phintuka@users.sourceforge.net>2012-01-12 15:02:56 +0200
commitecbf41ae10616d6e16befe9e47c3979248776dd9 (patch)
treedb32755d54c3d96ec66985bfccc2a46e02eacf2f /src/demuxers
parentde4365a21c9b74ae49df8b90097b41cf43616bfd (diff)
parentc183aac00525f9b15efb7a20bf984af68e40d87a (diff)
downloadxine-lib-ecbf41ae10616d6e16befe9e47c3979248776dd9.tar.gz
xine-lib-ecbf41ae10616d6e16befe9e47c3979248776dd9.tar.bz2
Merge from 1.1
--HG-- rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_real.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 64422b9ad..b1e884a45 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