- enhanced ffmpeg patch to cover 4.x

[packages/avifile.git] / avifile-gcc4.patch

--- avifile-0.7-0.7.45/include/avm_map.h.orig	2006-12-21 17:37:39.000000000 +0000
+++ avifile-0.7-0.7.45/include/avm_map.h	2006-12-21 17:37:43.000000000 +0000
@@ -45,7 +45,7 @@
 
     template <class Key1, class Value1> struct binary_tree_node
     {
-	avm_map::pair<Key1, Value1>* entry;
+	pair<Key1, Value1>* entry;
 	binary_tree_node<Key1, Value1>* left;
 	Key1 minval;
 	binary_tree_node<Key1, Value1>* right;
--- avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp.orig	2004-10-25 12:15:38.000000000 +0200
+++ avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp	2013-07-16 16:37:29.072365344 +0200
@@ -937,7 +937,7 @@
 	}
 
 	asf_packet* p;
-	unsigned short& size = chhdr.size;
+	unsigned short size = chhdr.size;
 	//printf("STREAMPACKET 0x%x  sz:%d  %lld   seq:%d part:%d  sc:%d\n", chhdr.kind, size, rsize, chhdr.seq, chhdr.partflag, chhdr.size_confirm);
 	switch (chhdr.kind)
 	{