diff --git a/comskip.c b/comskip.c index abe5916..d626056 100644 --- a/comskip.c +++ b/comskip.c @@ -537,10 +537,8 @@ int width, old_width, videowidth; int height, old_height; int ar_width = 0; int subsample_video = 0x1ff; -//#define MAXWIDTH 800 -//#define MAXHEIGHT 600 -#define MAXWIDTH 2000 -#define MAXHEIGHT 1200 +//#define MAXWIDTH 2000 +//#define MAXHEIGHT 1200 char haslogo[MAXWIDTH*MAXHEIGHT]; diff --git a/comskip.h b/comskip.h index 83f5edc..f2fd49c 100644 --- a/comskip.h +++ b/comskip.h @@ -2,6 +2,9 @@ #define COMSKIP #endif #ifdef _WIN32 -#define PACKAGE_STRING " Comskip 0.82.007" +#define PACKAGE_STRING " Comskip 0.82.009" #endif #define _UNICODE + +#define MAXWIDTH 4000 +#define MAXHEIGHT 2400 diff --git a/mpeg2dec.c b/mpeg2dec.c index e97e095..3013dc1 100755 --- a/mpeg2dec.c +++ b/mpeg2dec.c @@ -23,6 +23,8 @@ #include "platform.h" #include "vo.h" +#include "comskip.h" + #ifdef HAVE_SDL #include #endif @@ -900,23 +902,23 @@ int SubmitFrame(AVStream *video_st, AVFrame *pFrame , double pts) int changed = 0; // bitrate = pFrame->bit_rate; - if (pFrame->linesize[0] > 2000 || pFrame->height > 1200 || pFrame->linesize[0] < 100 || pFrame->height < 100) + if (pFrame->linesize[0] > MAXWIDTH || pFrame->height > MAXHEIGHT || pFrame->linesize[0] < 100 || pFrame->height < 100) { // printf("Panic: illegal height, width or frame period\n"); frame_ptr = NULL; return(0); } - if (height != pFrame->height && pFrame->height > 100 && pFrame->height < 2000) + if (height != pFrame->height && pFrame->height > 100 && pFrame->height < MAXHEIGHT) { height= pFrame->height; changed = 1; } - if (width != pFrame->linesize[0] && pFrame->linesize[0] > 100 && pFrame->linesize[0] < 2000) + if (width != pFrame->linesize[0] && pFrame->linesize[0] > 100 && pFrame->linesize[0] < MAXWIDTH) { width= pFrame->linesize[0]; changed = 1; } - if (videowidth != pFrame->width && pFrame->width > 100 && pFrame->width < 2000) + if (videowidth != pFrame->width && pFrame->width > 100 && pFrame->width < MAXWIDTH) { videowidth= pFrame->width; changed = 1; diff --git a/platform.h b/platform.h index f09c52c..c37a872 100644 --- a/platform.h +++ b/platform.h @@ -7,6 +7,9 @@ #include #include #include +#else +#undef WINVER +#define WINVER _WIN32_WINNT_WIN7 #endif #include