--- avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp @@ -433,7 +433,7 @@ /** \fn decodePesHeader */ -#define fail(x) {printf("[Ts Demuxer]*********"x"*******\n");return false;} +#define fail(x) {printf("[Ts Demuxer]*********" x "*******\n");return false;} bool tsPacket::decodePesHeader(TS_PESpacket *pes) { uint8_t *start=pes->payload+6; --- avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp @@ -37,7 +37,7 @@ { const int width; const int height; - const int fps; + const double fps; const dvColorFormat color; } dvProfileClass; --- avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h @@ -43,9 +43,9 @@ 0, /* max_b_frames */ \ 0, /* mpeg_quant */ \ 1, /* is_luma_elim_threshold */ \ - -2, /* luma_elim_threshold */ \ + (uint32_t)-2, /* luma_elim_threshold */ \ 1, /* is_chroma_elim_threshold */ \ - -5, /* chroma_elim_threshold */ \ + (uint32_t)-5, /* chroma_elim_threshold */ \ 0.05, /*lumi_masking */ \ 1, /* is lumi */ \ 0.01, /*dark_masking */ \ --- avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h @@ -53,9 +53,9 @@ 2, /* max_b_frames */ \ 1, /* mpeg_quant */ \ 1, /* is_luma_elim_threshold */ \ - -2, /* luma_elim_threshold */ \ + (uint32_t)-2, /* luma_elim_threshold */ \ 1, /* is_chroma_elim_threshold */ \ - -5, /* chroma_elim_threshold */ \ + (uint32_t)-5, /* chroma_elim_threshold */ \ 0.05, /*lumi_masking */ \ 1, /* is lumi */ \ 0.01, /*dark_masking */ \ --- avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h @@ -43,9 +43,9 @@ 2, /* max_b_frames */ \ 0, /* mpeg_quant */ \ 1, /* is_luma_elim_threshold */ \ - -2, /* luma_elim_threshold */ \ + (uint32_t)-2, /* luma_elim_threshold */ \ 1, /* is_chroma_elim_threshold */ \ - -5, /* chroma_elim_threshold */ \ + (uint32_t)-5, /* chroma_elim_threshold */ \ 0.05, /*lumi_masking */ \ 1, /* is lumi */ \ 0.01, /*dark_masking */ \ --- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h @@ -108,7 +108,7 @@ 1.0, /* float rate_tolerance; */ \ 0, /* uint32_t vbv_max_bitrate; */ \ 0, /* uint32_t vbv_buffer_size; */ \ - 0.9, /* uint32_t vbv_buffer_init; */ \ + 1, /* uint32_t vbv_buffer_init; */ \ 1.4, /* float ip_factor; */ \ 1.3, /* float pb_factor; */ \ 1, /* uint32_t aq_mode; */ \ --- avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp @@ -38,7 +38,7 @@ }idcToken; static const idcToken listOfIdc[]={ - {-1,"Auto"}, + {(uint32_t)-1,"Auto"}, {10,"1"}, {11,"1.1"}, {12,"1.2"}, --- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h 2017-12-13 14:29:02.753748000 +0300 @@ -85,7 +85,7 @@ 1.0, /* float rate_tolerance; */ \ 0, /* uint32_t vbv_max_bitrate; */ \ 0, /* uint32_t vbv_buffer_size; */ \ - 0.9, /* uint32_t vbv_buffer_init; */ \ + 1, /* uint32_t vbv_buffer_init; */ \ 1.4, /* float ip_factor; */ \ 1.3, /* float pb_factor; */ \ 2, /* uint32_t aq_mode; */ \ --- avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp @@ -38,7 +38,7 @@ }idcToken; static const idcToken listOfIdc[]={ - {-1,"Auto"}, + {(uint32_t)-1,"Auto"}, {10,"1"}, {20,"2"}, {21,"2.1"}, --- avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp @@ -56,7 +56,7 @@ uint32_t rdMode[5]= { - RD_NONE, + (uint32_t)RD_NONE, RD_DCT_ME, RD_HPEL_QPEL_16, RD_HPEL_QPEL_8, --- avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp.orig 2016-01-29 11:47:25.000000000 +0300 +++ avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp @@ -240,7 +240,7 @@ { // The chosen frame doesn't match the prediction. if (predicted_metric == 0) mismatch = 0.0; - else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric; + else mismatch = (100.0*abs((int)(predicted_metric - lowest)))/predicted_metric; if (mismatch < gthresh) { // It's close enough, so use the predicted one. @@ -283,7 +283,7 @@ { // The chosen frame doesn't match the prediction. if (predicted_metric == 0) mismatch = 0.0; - else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric; + else mismatch = (100.0*abs((int)(predicted_metric - lowest)))/predicted_metric; if ((int) mismatch <= gthresh) { // It's close enough, so use the predicted one.