Packman Build Service PMBS

Changes of Revision 17

avidemux-stdlib.patch Changed

@@ -44,7 +44,16 @@
  		   orgblk(0,+1), and orgblk(+1,+1)
 --- a/plugins/ADM_videoFilters/Telecide/ADM_vidDecTelecide.cpp
 +++ b/plugins/ADM_videoFilters/Telecide/ADM_vidDecTelecide.cpp
-@@ -690,7 +690,7 @@ uint8_t *finalpU,*finalpV;
+@@ -31,6 +31,8 @@
+ 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <cstdlib>
++#include <cmath>
+ #include "ADM_default.h"
+ #include "ADM_plugin_translate.h"
+ #include "ADM_videoFilterDynamic.h"
+@@ -690,7 +692,7 @@ uint8_t *finalpU,*finalpV;
                          {
                                  // The chosen frame doesn't match the prediction.
                                  if (predicted_metric == 0) mismatch = 0.0;
@@ -53,7 +62,7 @@
                                  if (mismatch < gthresh)
                                  {
                                          // It's close enough, so use the predicted one.
-@@ -732,7 +732,7 @@ uint8_t *finalpU,*finalpV;
+@@ -732,7 +734,7 @@ uint8_t *finalpU,*finalpV;
                                          {
                                                  // The chosen frame doesn't match the prediction.
                                                  if (predicted_metric == 0) mismatch = 0.0;
@@ -62,7 +71,7 @@
                                                  if ((int) mismatch <= gthresh)
                                                  {
                                                          // It's close enough, so use the predicted one.
-@@ -1222,7 +1222,7 @@ void Telecide::CalculateMetrics(int fram
+@@ -1222,7 +1224,7 @@ void Telecide::CalculateMetrics(int fram
                                  // Test combination with current frame.
                                  tmp1 = ((long)currbot0[x] + (long)currbot2[x]);
  //                              diff = abs((long)currtop0[x] - (tmp1 >> 1));
@@ -71,7 +80,7 @@
                                  if (diff > nt)
                                  {
                                          c += diff;
-@@ -1242,7 +1242,7 @@ void Telecide::CalculateMetrics(int fram
+@@ -1242,7 +1244,7 @@ void Telecide::CalculateMetrics(int fram
  
                                  // Test combination with previous frame.
                                  tmp1 = ((long)a0[x] + (long)a2[x]);
@@ -80,7 +89,7 @@
                                  if (diff > nt)
                                  {
                                          p += diff;
-@@ -1341,7 +1341,7 @@ void Telecide::CalculateMetrics(int fram
+@@ -1341,7 +1343,7 @@ void Telecide::CalculateMetrics(int fram
  
                                                  // Test combination with current frame.
                                                  tmp1 = ((long)currbot0[x] + (long)currbot2[x]);
@@ -89,7 +98,7 @@
                                                  if (diff > nt)
                                                  {
                                                          c += diff;
-@@ -1361,7 +1361,7 @@ void Telecide::CalculateMetrics(int fram
+@@ -1361,7 +1363,7 @@ void Telecide::CalculateMetrics(int fram
  
                                                  // Test combination with previous frame.
                                                  tmp1 = ((long)a0[x] + (long)a2[x]);
@@ -98,7 +107,7 @@
                                                  if (diff > nt)
                                                  {
                                                          p += diff;
-@@ -1586,7 +1586,7 @@ struct PREDICTION *Telecide::PredictSoft
+@@ -1586,7 +1588,7 @@ struct PREDICTION *Telecide::PredictSoft
                          c = cache[y%CACHE_SIZE].metrics[C]; 
                          n = cache[y%CACHE_SIZE].metrics[N];
                          if (c == 0) c = 1;