mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-01 09:51:22 +02:00
- 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
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user