diff --git a/Makefile b/Makefile index 6c21467..fbf9f4e 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ CC ?= gcc -CFLAGS ?= -Wall -O2 +CFLAGS ?= APPINDICATOR ?= appindicator3-0.1 GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` @@ -44,6 +44,8 @@ package: @echo "usage: RELEASE=2. make -B package" else +CFLAGS += -Wall -O2 + JPEG = -I/opt/libjpeg-turbo/include USBMUXD = -I/opt/libimobiledevice/include LIBAV = -L/opt/ffmpeg4/lib -lswscale -lavutil diff --git a/src/av.c b/src/av.c index cbeb5b2..76d261c 100644 --- a/src/av.c +++ b/src/av.c @@ -110,6 +110,10 @@ void *DecodeThreadProc(__attribute__((__unused__)) void *args) { return 0; } +const char* codec_names[] = { + "jpg", "avc", +}; + void *VideoThreadProc(void *args) { char buf[32]; SOCKET videoSocket = (SOCKET_PTR) args; diff --git a/src/common.h b/src/common.h index 4b9b711..9cb7af1 100644 --- a/src/common.h +++ b/src/common.h @@ -9,8 +9,8 @@ #ifndef _COMMON_H_ #define _COMMON_H_ -#define APP_VER_INT 211 -#define APP_VER_STR "2.1.1" +#define APP_VER_INT 212 +#define APP_VER_STR "2.1.2" #define MSG_ERROR(str) ShowError("Error",str) #define MSG_LASTERROR(str) ShowError(str,strerror(errno)) diff --git a/src/settings.h b/src/settings.h index ceecb4f..4b4813c 100644 --- a/src/settings.h +++ b/src/settings.h @@ -36,15 +36,6 @@ enum control_codes { CB_V_FLIP, }; -enum { - CODEC_JPG = 0, - CODEC_AVC, -}; - -static const char* codec_names[] = { - "jpg", "avc", -}; - struct settings { char ip[16]; int port;