1 diff -urN aa/avifile-0.7-0.7.38/include/aviplay.h avifile-0.7-0.7.38/include/aviplay.h
2 --- aa/avifile-0.7-0.7.38/include/aviplay.h 2003-05-25 00:51:30.000000000 +0200
3 +++ avifile-0.7-0.7.38/include/aviplay.h 2004-07-02 15:03:57.497990112 +0200
8 -typedef void (*KILLHANDLER)(int, void* p = 0);
9 -typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p = 0);
10 +typedef void (*KILLHANDLER)(int, void* p);
11 +typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p);
15 diff -urN aa/avifile-0.7-0.7.38/include/avm_map.h avifile-0.7-0.7.38/include/avm_map.h
16 --- aa/avifile-0.7-0.7.38/include/avm_map.h 2003-03-27 02:01:22.000000000 +0100
17 +++ avifile-0.7-0.7.38/include/avm_map.h 2004-07-02 15:15:04.427601400 +0200
20 // cast to the needed type - used to prevent internal compiler error
22 - avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
23 + //avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
24 + _Tnode* node = (_Tnode*) n;
28 diff -urN aa/avifile-0.7-0.7.38/include/avm_stl.h avifile-0.7-0.7.38/include/avm_stl.h
29 --- aa/avifile-0.7-0.7.38/include/avm_stl.h 2003-06-08 17:57:05.000000000 +0200
30 +++ avifile-0.7-0.7.38/include/avm_stl.h 2004-07-02 15:12:53.351527992 +0200
32 m_Type = new Type[m_uiCapacity];
34 ~qring() { delete[] m_Type; }
35 + qring<Type>(const qring<Type>& t) {}
36 qring<Type>& operator=(const qring<Type>& t)
43 - qring<Type>(const qring<Type>& t) {}
45 uint_t bpos() const { return (m_uiPos > 0) ? m_uiPos - 1 : m_uiCapacity - 1; }
46 uint_t fpos() const { return (m_uiSize > m_uiPos) ? m_uiPos + m_uiCapacity - m_uiSize: m_uiPos - m_uiSize; }
47 diff -urN aa/avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp
48 --- aa/avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp 2003-05-27 17:26:31.000000000 +0200
49 +++ avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp 2004-07-02 15:08:12.642202296 +0200
54 -int AsfNetworkInputStream::write(const void* buffer, uint_t size)
55 +int AsfNetworkInputStream::write(const void* b, uint_t size)
57 + const char* buffer = (const char*) b;
61 int i = ::write(m_iSocket, buffer, wsize);
64 - (const char*)buffer += i;
71 -int AsfNetworkInputStream::dwrite(const void* buffer, uint_t size)
72 +int AsfNetworkInputStream::dwrite(const void* b, uint_t size)
74 + const char* buffer = (const char*) b;
79 int i = ::write(m_lfd, buffer, size);
82 - (const char*)buffer += i;
87 diff -urN aa/avifile-0.7-0.7.38/lib/common/image.cpp avifile-0.7-0.7.38/lib/common/image.cpp
88 --- aa/avifile-0.7-0.7.38/lib/common/image.cpp 2003-05-25 01:00:58.000000000 +0200
89 +++ avifile-0.7-0.7.38/lib/common/image.cpp 2004-07-02 15:16:53.695990080 +0200
94 - (const uint8_t*) m_pPlane[0] = data;
95 + m_pPlane[0] = (uint8_t*) data;
99 diff -urN aa/avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp
100 --- aa/avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp 2003-05-20 16:33:13.000000000 +0200
101 +++ avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp 2004-07-02 15:19:50.622093224 +0200
104 op.b_o_s = 1; /* beginning of stream for first packet */
105 op.bytes = hdrsizes[0];
106 - (const void*) op.packet = vorbishdr;
107 + op.packet = (unsigned char*) vorbishdr;
108 vorbishdr += op.bytes;
109 if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
114 op.bytes = hdrsizes[1];
115 - (const void*) op.packet = vorbishdr;
116 + op.packet = (unsigned char*) vorbishdr;
117 vorbishdr += op.bytes;
118 if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
123 op.bytes = hdrsizes[2];
124 - (const void*) op.packet = vorbishdr;
125 + op.packet = (unsigned char*) vorbishdr;
126 vorbishdr += op.bytes;
127 if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)