r11814 - packages/trunk/jugglemaster/debian/patches

[Paul Wise]

Author: pabs
Date: 2011-02-21 05:46:44 +0000 (Mon, 21 Feb 2011)
New Revision: 11814

Modified:
   packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch
Log:
refresh ffmpeg patch

Modified: packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch	2011-02-21 05:42:27 UTC (rev 11813)
+++ packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch	2011-02-21 05:46:44 UTC (rev 11814)
@@ -11,20 +11,4 @@
 +	output_type->SetStringSelection(wxT("MPEG"));
  #endif
  
- 	typesizer->Add(new wxStaticText(this, 0, "Output Type"),
-@@ -535,13 +535,13 @@
- 	wxMemoryDC dc;
- 	struct ball firstpos[BMAX];
- 
--	wxProgressDialog progress("Progress","Creating MPEG",
-+	wxProgressDialog progress(wxT("Progress"),wxT("Creating MPEG"),
- 		max_iterations->GetValue(), this, wxPD_APP_MODAL|wxPD_CAN_ABORT);
- 
- 	int current_frames = 0;
- 	int done = 0;
- 
--	outputfile = fopen((const char *)filename->GetValue(),"w");
-+	outputfile = fopen((const char *)filename->GetValue().mb_str(wxConvUTF8),"w");
- 	if(outputfile == NULL) return 1;
- 
- 	avcodec_init();
+ 	typesizer->Add(new wxStaticText(this, 0, wxT("Output Type")),