Merge tag 'upstream/1.1.1+rev1500'

Upstream version 1.1.1+rev1500

5 files changed, 20 insertions, 21 deletions

diff --git a/test/libesg/testesg.c b/test/libesg/testesg.c
index f2183ac..c9788ae 100644
--- a/test/libesg/testesg.c
+++ b/test/libesg/testesg.c
@@ -199,7 +199,7 @@ int main(int argc, char *argv[]) {
 		struct esg_namespace_prefix *namespace_prefix = NULL;
 		struct esg_xml_fragment_type *xml_fragment_type = NULL;
 		struct esg_bim_encoding_parameters *bim_encoding_parameters = NULL;
-		struct esg_bim_decoder_init *bim_decoder_init = NULL;
+//		struct esg_bim_decoder_init *bim_decoder_init = NULL;
 		struct esg_session_partition_declaration *partition = NULL;
 		struct esg_session_field *field = NULL;
 		struct esg_session_ip_stream *ip_stream = NULL;
diff --git a/test/libucsi/testucsi.c b/test/libucsi/testucsi.c
index e0a16c1..1e17104 100644
--- a/test/libucsi/testucsi.c
+++ b/test/libucsi/testucsi.c
@@ -2022,9 +2022,8 @@ void parse_dvb_descriptor(struct descriptor *d, int indent, int data_type)
 			int network_id = dvb_linkage_data_08_network_id(dx, d08);
 			int initial_service_id = dvb_linkage_data_08_initial_service_id(dx, d08);
 			int length = 0;
-			uint8_t *data;
 
-			data = dvb_linkage_data_08_data(dx, d08, &length);
+			dvb_linkage_data_08_data(dx, d08, &length);
 			iprintf(indent, "DSC hand_over_type:%i origin_type:%i\n",
 				d08->hand_over_type, d08->origin_type);
 			if (network_id != -1) {
diff --git a/test/lock_s.c b/test/lock_s.c
index 7bbab59..b3bcd70 100644
--- a/test/lock_s.c
+++ b/test/lock_s.c
@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
 {
 	int opt;
 	int ret, fd, adapter=0, frontend=0, pos;
-	int simple;
+//	int simple;
 	struct lnb_types_st lnb;
 	struct sec_params sec;
 
@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case 'H':
-			simple = 1; /* human readable */
+//			simple = 1; /* human readable */
 			break;
 		}
 	}
diff --git a/test/test_av_play.c b/test/test_av_play.c
index b7ad867..2b342db 100644
--- a/test/test_av_play.c
+++ b/test/test_av_play.c
@@ -245,7 +245,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns
 {
 	struct pollfd pfd[NFD];
 	unsigned short pos = 0;
-	int stopped = 0;
+//	int stopped = 0;
 
 	pfd[0].fd = STDIN_FILENO;
 	pfd[0].events = POLLIN;
@@ -284,7 +284,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns
 					}
 					deviceClear(afd, -1);
 					printf("playback frozen\n");
-					stopped = 1;
+//					stopped = 1;
 					break;
 
 				case 's':
@@ -296,7 +296,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns
 						deviceClear(afd, vfd);
 					}
 					printf("playback stopped\n");
-					stopped = 1;
+//					stopped = 1;
 					break;
 
 				case 'c':
@@ -310,7 +310,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns
 						videoContinue(vfd);
 					}
 					printf("playback continued\n");
-					stopped = 0;
+//					stopped = 0;
 					break;
 
 				case 'p':
@@ -326,7 +326,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns
 					}
 					audioSetMute(afd, 0);
 					printf("playback started\n");
-					stopped = 0;
+//					stopped = 0;
 					break;
 
 				case 'f':
@@ -336,21 +336,21 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns
 						videoFastForward(vfd,0);
 					}
 					printf("fastforward\n");
-					stopped = 0;
+//					stopped = 0;
 					break;
 
 				case 'm':
 					audioSetAVSync(afd, 0);
 					audioSetMute(afd, 1);
 					printf("mute\n");
-					stopped = 0;
+//					stopped = 0;
 					break;
 
 				case 'u':
 					audioSetAVSync(afd, 1);
 					audioSetMute(afd, 0);
 					printf("unmute\n");
-					stopped = 0;
+//					stopped = 0;
 					break;
 
 				case 'd':
@@ -367,7 +367,7 @@ static void copy_to_dvb(int vfd, int afd, int cfd, const uint8_t* ptr, const uns
 						videoSlowMotion(vfd,2);
 					}
 					printf("slowmotion\n");
-					stopped = 0;
+//					stopped = 0;
 					break;
 
 				case 'q':
diff --git a/test/test_video.c b/test/test_video.c
index fe2f440..286b1d1 100644
--- a/test/test_video.c
+++ b/test/test_video.c
@@ -229,7 +229,7 @@ void play_file_video(int filefd, int fd)
 	int count;
 	int written;
 	struct pollfd pfd[NFD];
-	int stopped = 0;
+//	int stopped = 0;
 
 	pfd[0].fd = STDIN_FILENO;
 	pfd[0].events = POLLIN;
@@ -258,37 +258,37 @@ void play_file_video(int filefd, int fd)
 					case 'z':
 						videoFreeze(fd);
 						printf("playback frozen\n");
-						stopped = 1;
+//						stopped = 1;
 						break;
 
 					case 's':
 						videoStop(fd);
 						printf("playback stopped\n");
-						stopped = 1;
+//						stopped = 1;
 						break;
 
 					case 'c':
 						videoContinue(fd);
 						printf("playback continued\n");
-						stopped = 0;
+//						stopped = 0;
 						break;
 
 					case 'p':
 						videoPlay(fd);
 						printf("playback started\n");
-						stopped = 0;
+//						stopped = 0;
 						break;
 
 					case 'f':
 						videoFastForward(fd,0);
 						printf("fastforward\n");
-						stopped = 0;
+//						stopped = 0;
 						break;
 
 					case 'm':
 						videoSlowMotion(fd,2);
 						printf("slowmotion\n");
-						stopped = 0;
+//						stopped = 0;
 						break;
 
 					case 'q':