diff -r 73b910014d07 util/gnutv/gnutv.c
--- a/util/gnutv/gnutv.c	Sat Jul 05 16:38:32 2008 +0200
+++ b/util/gnutv/gnutv.c	Thu Jul 10 23:04:30 2008 +0100
@@ -66,6 +66,7 @@
 		"			 * C-MULTI - Big Dish - Multipoint LNBf, 3700 to 4200 MHz,\n"
 		"						Dual LO, H:5150MHz, V:5750MHz.\n"
 		"			 * One of the sec definitions from the secfile if supplied\n"
+		" -buffer <size>		DVR buffer size (default 0=>do no change)\n"
 		" -out decoder		Output to hardware decoder (default)\n"
 		"      decoderabypass	Output to hardware decoder using audio bypass\n"
 		"      dvr		Output stream to dvr device\n"
@@ -124,6 +125,7 @@
 	struct gnutv_ca_params gnutv_ca_params;
 	int ffaudiofd = -1;
 	int usertp = 0;
+	int buffersize = 0;
 
 	while(argpos != argc) {
 		if (!strcmp(argv[argpos], "-h")) {
@@ -166,6 +168,14 @@
 			if ((argc - argpos) < 2)
 				usage();
 			secid = argv[argpos+1];
+			argpos+=2;
+		} else if (!strcmp(argv[argpos], "-buffer")) {
+			if ((argc - argpos) < 2)
+				usage();
+			if (sscanf(argv[argpos+1], "%i", &buffersize) != 1)
+				usage();
+			if (buffersize < 0)
+				usage();
 			argpos+=2;
 		} else if (!strcmp(argv[argpos], "-out")) {
 			if ((argc - argpos) < 2)
@@ -320,7 +330,7 @@
 		gnutv_dvb_start(&gnutv_dvb_params);
 
 		// start the data stuff
-		gnutv_data_start(output_type, ffaudiofd, adapter_id, demux_id, outfile, outif, outaddrs, usertp);
+		gnutv_data_start(output_type, ffaudiofd, adapter_id, demux_id, buffersize, outfile, outif, outaddrs, usertp);
 	}
 
 	// the UI
diff -r 73b910014d07 util/gnutv/gnutv_data.c
--- a/util/gnutv/gnutv_data.c	Sat Jul 05 16:38:32 2008 +0200
+++ b/util/gnutv/gnutv_data.c	Thu Jul 10 23:04:30 2008 +0100
@@ -77,7 +77,7 @@
 static int pid_fds_count = 0;
 
 void gnutv_data_start(int _output_type,
-		    int ffaudiofd, int _adapter_id, int _demux_id,
+		    int ffaudiofd, int _adapter_id, int _demux_id, int buffer_size,
 		    char *outfile,
 		    char* outif, struct addrinfo *_outaddrs, int _usertp)
 {
@@ -114,6 +114,14 @@
 			exit(1);
 		}
 
+		// optionally set dvr buffer size
+		if (buffer_size > 0) {
+			if (dvbdemux_set_buffer(dvrfd, buffer_size) != 0) {
+				fprintf(stderr, "Failed to set DVR buffer size\n");
+				exit(1);
+			}
+		}
+
 		pthread_create(&outputthread, NULL, fileoutputthread_func, NULL);
 		break;
 
@@ -140,6 +148,14 @@
 		if (dvrfd < 0) {
 			fprintf(stderr, "Failed to open DVR device\n");
 			exit(1);
+		}
+
+		// optionally set dvr buffer size
+		if (buffer_size > 0) {
+			if (dvbdemux_set_buffer(dvrfd, buffer_size) != 0) {
+				fprintf(stderr, "Failed to set DVR buffer size\n");
+				exit(1);
+			}
 		}
 
 		pthread_create(&outputthread, NULL, udpoutputthread_func, NULL);
diff -r 73b910014d07 util/gnutv/gnutv_data.h
--- a/util/gnutv/gnutv_data.h	Sat Jul 05 16:38:32 2008 +0200
+++ b/util/gnutv/gnutv_data.h	Thu Jul 10 23:04:30 2008 +0100
@@ -26,7 +26,7 @@
 #include <netdb.h>
 
 extern void gnutv_data_start(int output_type,
-			   int ffaudiofd, int adapter_id, int demux_id,
+			   int ffaudiofd, int adapter_id, int demux_id, int buffer_size,
 			   char *outfile,
 			   char* outif, struct addrinfo *outaddrs, int usertp);
 extern void gnutv_data_stop(void);