summaryrefslogtreecommitdiff
path: root/src/demuxers/iff.h
diff options
context:
space:
mode:
authorMatthias Hopf <mat@mshopf.de>2008-08-08 15:39:37 +0200
committerMatthias Hopf <mat@mshopf.de>2008-08-08 15:39:37 +0200
commit93f518565b5f53c795aeddf544f3582d44ff9fe6 (patch)
treef79884a40a9f80068b15d1c9cc8cb7660a1bf3fb /src/demuxers/iff.h
parent6f79d815918aa83d706b6dc6722c2006f27e8084 (diff)
parent8c24b5cd856fa47f605eba68ec0a49bd4d47d7da (diff)
downloadxine-lib-93f518565b5f53c795aeddf544f3582d44ff9fe6.tar.gz
xine-lib-93f518565b5f53c795aeddf544f3582d44ff9fe6.tar.bz2
Merge.
Diffstat (limited to 'src/demuxers/iff.h')
-rw-r--r--src/demuxers/iff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/iff.h b/src/demuxers/iff.h
index 94830f69c..8ac24a697 100644
--- a/src/demuxers/iff.h
+++ b/src/demuxers/iff.h
@@ -27,8 +27,8 @@
#define IFFP_IFF_H
#define IFF_OKAY 0L
-#define CLIENT_ERROR 1L
-#define NOFILE 5L
+#define IFF_CLIENT_ERROR 1L
+#define IFF_NOFILE 5L
#define FOURCC_CHUNK BE_FOURCC
#define IFF_16SV_CHUNK FOURCC_CHUNK('1', '6', 'S', 'V')