Description: GCC now rejects this code as invalid - default values aren't permitted for function pointers.
Author: Iain Lane <iain.lane@canonical.com>
Applied-Upstream: 2.6.9

Index: b/avidemux/ADM_coreUI/include/DIA_factory.h
===================================================================
--- a/avidemux/ADM_coreUI/include/DIA_factory.h
+++ b/avidemux/ADM_coreUI/include/DIA_factory.h
@@ -206,7 +206,7 @@
 };
 /*********************************************/
 typedef diaElem *CREATE_TOGGLE_UINT(uint32_t *toggleValue,const char *toggleTitle, uint32_t *uintval, 
-								const char *name,uint32_t min,uint32_t max,const char *tip=NULL);
+								const char *name,uint32_t min,uint32_t max,const char *tip);
 class diaElemToggleUint : public diaElem
 {
   protected:
@@ -226,7 +226,7 @@
   int getRequiredLayout(void);
 };
 typedef diaElem *CREATE_TOGGLE_INT(uint32_t *toggleValue,const char *toggleTitle, int32_t *intval, 
-									const char *name,int32_t min,int32_t max,const char *tip=NULL);
+									const char *name,int32_t min,int32_t max,const char *tip);
 class diaElemToggleInt : public diaElem
 {
   protected:
@@ -620,13 +620,13 @@
   void updateMe(void);
 };
 /**********************************************/
-typedef diaElem *(CREATE_THREADCOUNT_T)(uint32_t *value, const char *title, const char *tip = NULL);
+typedef diaElem *(CREATE_THREADCOUNT_T)(uint32_t *value, const char *title, const char *tip);
 class diaElemThreadCount : public diaElem
 {
 
 public:
   
-  diaElemThreadCount(uint32_t *value, const char *title, const char *tip = NULL);
+  diaElemThreadCount(uint32_t *value, const char *title, const char *tip);
   virtual ~diaElemThreadCount() ;
   void setMe(void *dialog, void *opaque, uint32_t line);
   void getMe(void);
@@ -634,14 +634,14 @@
   void updateMe(void);
 };
 /**********************************************/
-typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *value, const char *title, const char *tip = NULL);
+typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *value, const char *title, const char *tip);
 class diaElemAspectRatio : public diaElem
 {
 public:
 	uint32_t *den;
 	void *denControl, *label;
 
-	diaElemAspectRatio(uint32_t *num, uint32_t *den, const char *title, const char *tip = NULL);
+	diaElemAspectRatio(uint32_t *num, uint32_t *den, const char *title, const char *tip);
 	virtual ~diaElemAspectRatio();
 	void setMe(void *dialog, void *opaque, uint32_t line);
 	void getMe(void);
Index: b/avidemux/ADM_script/ADM_JSFunctions.cpp
===================================================================
--- a/avidemux/ADM_script/ADM_JSFunctions.cpp
+++ b/avidemux/ADM_script/ADM_JSFunctions.cpp
@@ -835,7 +835,7 @@
 JSBool facThreadCount(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
 	uint32_t val=1;
-	diaElemThreadCount threadcount(&val,"ThreadCount");
+	diaElemThreadCount threadcount(&val,"ThreadCount", NULL);
       
     diaElem *elems[]={&threadcount   };
     
Index: b/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp
===================================================================
--- a/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp
+++ b/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp
@@ -203,7 +203,7 @@
 		frameSimd.swallow(&capsToggleSSE3);
 		frameSimd.swallow(&capsToggleSSSE3);
 
-		diaElemThreadCount lavcThreadCount(&lavcThreads, QT_TR_NOOP("_lavc threads:"));
+		diaElemThreadCount lavcThreadCount(&lavcThreads, QT_TR_NOOP("_lavc threads:"), NULL);
 
 		diaElemFrame frameThread(QT_TR_NOOP("Multi-threading"));
 		frameThread.swallow(&lavcThreadCount);
