- Remove some globals from vcrcontrol

- Allow ttx/epg keys for timeshift
- Fix record+live streaming
- Live stream code changes for testing
- Changes to handle internal CA multi-decoding
- hack for -Werror compiling



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1040 e54a6e83-5905-42d5-8d5c-058d10e6a962

src/driver/pictureviewer/crw.cpp

@@ -1,19 +1,21 @@
 #include "pv_config.h"
 #include <cstring>
 #include <cstdlib>
+
 #ifdef FBV_SUPPORT_CRW
-	#include <stdio.h>
-	#include <sys/types.h>
-	#include <sys/stat.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <setjmp.h>
+#include "pictureviewer.h"
+
+#undef HAVE_STDLIB_H // -Werror complain
 extern "C" {
 #include <jpeglib.h>
 }
-	#include <setjmp.h>
-	#include "pictureviewer.h"
-
 /*
    Get a 2-byte integer, making no assumptions about CPU byte order.
    Nor should we assume that the compiler evaluates left-to-right.

src/driver/pictureviewer/jpeg.cpp

@@ -17,10 +17,6 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-
-extern "C" {
-#include <jpeglib.h>
-}
 	
 #include <setjmp.h>
 
@@ -28,6 +24,11 @@ extern "C" {
 #include "pictureviewer.h"
 #include "picv_client_server.h"
 
+#undef HAVE_STDLIB_H // -Werror complain
+extern "C" {
+#include <jpeglib.h>
+}
+
 #define MIN(a,b) ((a)>(b)?(b):(a))
 
 struct r_jpeg_error_mgr