Packman Build Service PMBS

Changes of Revision 19

avidemux-stdlib.patch Changed

@@ -1,3 +1,14 @@
+--- a/avidemux/ADM_inputs/ADM_h263/ADM_h263.cpp
++++ b/avidemux/ADM_inputs/ADM_h263/ADM_h263.cpp
+@@ -169,7 +169,7 @@ uint8_t    h263Header::open(const char *
+ 		delta &=0xff;
+ 		if(!nbImg) delta=0;
+ 		//++++++++++++++PTYPE++++++++++++
+-		if(((word&0xc0)==0x80) && ( abs(delta)<MAX_DELTA))
++		if(((word&0xc0)==0x80) && ( delta < MAX_DELTA))
+ 		{
+ 		last_pts=pts;
+ 		nbImg++;
 --- a/avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp
 +++ b/avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp
 @@ -19,8 +19,9 @@
@@ -29,6 +40,51 @@
  				{
  					aprintf("Wanted %llu",val);
  					aprintf(" got %llu\n",f);					
+--- a/avidemux/ADM_outputs/oplug_ogm/op_ogsave.cpp
++++ b/avidemux/ADM_outputs/oplug_ogm/op_ogsave.cpp
+@@ -163,7 +163,7 @@ uint8_t error=0;
+ 			}
+ 		}
+ 
+-                if(abs(j-_togo)<3 && error) error=0; // might be caused by late B frame
++                if((_togo - j) < 3 && error) error=0; // might be caused by late B frame
+ 		delete encoding_gui;
+ 		encoding_gui=NULL;
+ 		//________________ Flush______________________
+--- a/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_bitrateHisto.cpp
++++ b/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_bitrateHisto.cpp
+@@ -50,7 +50,7 @@ uint32_t maxBFrame=0;
+ 	// 1st compute the total
+ 	
+ 	max=0;
+-	if(!(frameEnd>frameStart) || abs(frameStart-frameEnd)<5)
++	if(!(frameEnd>frameStart) || (frameStart-frameEnd)<5)
+ 	{
+           GUI_Error_HIG(QT_TR_NOOP("No data"), NULL);
+ 		return ;
+--- a/avidemux/gtk_gui.cpp
++++ b/avidemux/gtk_gui.cpp
+@@ -1814,7 +1814,7 @@ uint8_t ADM_saveRaw (const char *name)
+ 	    }
+ 	  if (!found)
+           {
+-            if(abs(i-frameEnd)>2)
++            if((frameEnd - i) > 2)
+                 ret=0;
+             else
+                 ret=1;  // Good enough
+--- a/avidemux/gui_navigate.cpp
++++ b/avidemux/gui_navigate.cpp
+@@ -243,7 +243,8 @@ void GUI_NextPrevBlackFrame(int dir)
+         else total=curframe+1;
+    while(1)
+    {
+-        int current=abs(curframe-orgFrame);
++      uint32_t current;
++      current = curframe > orgFrame ? curframe - orgFrame : orgFrame - curframe;
+       f=curframe+dir;
+       if(work->update(current,total)) break;
+ 
 --- a/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/find_best_one_pel.cc
 +++ b/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/find_best_one_pel.cc
 @@ -1,7 +1,7 @@