# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fk@fabiankeil.de-20120707112146-c3jcwq9mqtzz0ziy
# target_branch: http://bazaar.launchpad.net/~bdrung/dvdbackup/trunk/
# testament_sha1: ff44b9bc0c3882365b04183abd38635a9b84e015
# timestamp: 2012-07-07 13:28:01 +0200
# base_revision_id: benjamin.drung@gmail.com-20120624015824-\
#   4pbu9x5zrk49b83u
# 
# Begin patch
=== modified file 'src/dvdbackup.c'
--- src/dvdbackup.c	2012-06-24 01:13:07 +0000
+++ src/dvdbackup.c	2012-07-07 11:21:46 +0000
@@ -809,7 +809,6 @@
 
 
 static int DVDCopyBlocks(dvd_file_t* dvd_file, int destination, int offset, int size, char* filename, read_error_strategy_t errorstrat) {
-	int i;
 
 	/* all sizes are in DVD logical blocks */
 	int remaining = size;
@@ -818,13 +817,8 @@
 	int to_read = BUFFER_SIZE;
 	int act_read; /* number of buffers actually read */
 
-	/* Write buffer */
-	unsigned char buffer[BUFFER_SIZE * DVD_VIDEO_LB_LEN];
-	unsigned char buffer_zero[BUFFER_SIZE * DVD_VIDEO_LB_LEN];
-
-	for(i = 0; i < BUFFER_SIZE * DVD_VIDEO_LB_LEN; i++) {
-		buffer_zero[i] = '\0';
-	}
+	/* Write buffer, also used as padding source. */
+	static unsigned char buffer[BUFFER_SIZE * DVD_VIDEO_LB_LEN];
 
 	while( remaining > 0 ) {
 
@@ -887,7 +881,7 @@
 				break;
 			}
 
-			if (write(destination, buffer_zero, numBlanks * DVD_VIDEO_LB_LEN) != numBlanks * DVD_VIDEO_LB_LEN) {
+			if (write(destination, buffer, numBlanks * DVD_VIDEO_LB_LEN) != numBlanks * DVD_VIDEO_LB_LEN) {
 				fprintf(stderr, _("Error writing %s (padding)\n"), filename);
 				return 1;
 			}

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ9MFI0AAZxfgAAwcHf//18t
35q////4UAQm5dEubu54M9V7wyJFPTammFPUfqjNTTyhp6hoHqNNGTRoaNpAGSRpiGVPATQmgAPU
DQAAADQJIgmo000ynpkEIeoNAPUAAA0aDQSSmimxPSNT0ygep6npqaGgADQNAAAJKEmZQZTaTT0Y
keowgAAAADQERES9HeyuoF/+94P0bW80O22OjAfQFWXEZRgYyjXDmb5vCuK/tRoEQ6tJtebG8rJA
oWZJEOqktxLd4tM+Flqvbqw4Ho1S6ZfXmnUx+NGyzxSs0vL8u5m6XID277LKptDn6MttN0MKXEDC
vPYuzEzllbFS1qwKoJRY1bjFxKSvUosaSqP4DZSJAu38WjDLK1cSWVuOyCEU1NacIicpMg6EI2Fp
CqV6oEmmoFRpIqEcesVigyrfj3OimJw5tRnuFMC5HSJKsEICixVFLSeYQByTT0lpmNVqb8h1vlgf
Hhbn1zrZYLcUcRARiwpOmBtanthr0W35ghwCkJWPk5TSVirWUte9oxSczKqJLGJIxHFVgbVTsqRg
YV7aolk85knWplDGgQUd9Jw61t0F4roTw1xBqy4B9Jde5pBUhtyIJ7FyOcbb3uzHFTGBAqAoLlMN
9IXHWiopGviEJRbNQzUqgMQxqxZnPhciiz8B/ThUuo5ALryFsWaVzkXTTaJUidTfvzbG9XgxK+9u
XDwyyS4g+dig2aTkxirRr0nz3Cw7ImmA+wt64Drlb9gygqisxtAYX5Mmf6MBtuHg4ZyNGhhpFgYB
xdwy37Ce7PkIt7GSCESOAUdoDQO2zKE0AXR2OUTQIrYEOhOtLklnkx1tDOQ5yqhkNtBVhQQec6ev
DIKmCphpizOJ/e0+YHq9sSLu0yy0ve50agvkE+fE5hMZmVMsZvbO4nmVSk8l8ivM/UQ4QykpYyJw
jaIAIIp8vjhDq8XHiC0MjBgemfmGVc8oR8Xa24aheWK6BHUJplpHDO12KpzkovGH7zE+U99K9ajy
G6GAv5U1VUlVcbsUKMTmvHwQ9OiLPC9fngaUqpkQKVprz5iwZZa4FZGRY01rhZ0ShdyKgpKQYNT8
at/37OF1SFuukBzZtE/WmbBH8S1mC7eBiTKlIRk4NbnC/CaLfjp1pHXgZlhmY0MJiJaxPomDiFU8
I24ErSWMGDhVgqAsuBccEXKZGqkwvbajaSGHQiVeWh4wvVOXdpOKiGVbyPOKcGtkODBR4jIzxdVh
wqRNBByMnB2TVDutOBq333UbFFBbXhFnNDQNOYxxbKGD5t80AXPFyIc5nMYW4CZTGUxLgCwHAwFE
OW0Ks92qiLLOWZXz9dunJMtfJOuJRu0Gx1q7pFYuuttcShK19jF1MscmVKNdoCpS+8S4NwU8byRk
P7kezdQ9xaQ5JW2GmY6pk2OgrzRbKqIPAJsqdQtiwjupyurhIwv1oe7DE0WBr6IVUhxaxOLg3FEq
Cl8AiorXLSDWY/B4SlQee7YaAZv8XckU4UJCfTBSNA==