WinGui:

- MP3 in MP4 files is now enabled.

git-svn-id: svn://localhost/HandBrake/trunk@3206 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index 46692e5..04bcbd2 100644 (file)
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -36,13 +36,13 @@ namespace Handbrake.Controls
         {\r
             this.components = new System.ComponentModel.Container();\r
             this.lv_audioList = new System.Windows.Forms.ListView();\r
-            this.col_id = new System.Windows.Forms.ColumnHeader();\r
-            this.col_Source = new System.Windows.Forms.ColumnHeader();\r
-            this.col_codec = new System.Windows.Forms.ColumnHeader();\r
-            this.col_mixdown = new System.Windows.Forms.ColumnHeader();\r
-            this.col_samplerate = new System.Windows.Forms.ColumnHeader();\r
-            this.col_bitrate = new System.Windows.Forms.ColumnHeader();\r
-            this.col_drc = new System.Windows.Forms.ColumnHeader();\r
+            this.col_id = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
+            this.col_Source = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
+            this.col_codec = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
+            this.col_mixdown = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
+            this.col_samplerate = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
+            this.col_bitrate = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
+            this.col_drc = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
             this.audioMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.audioList_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
             this.audioList_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -324,7 +324,7 @@ namespace Handbrake.Controls
             this.drp_audioTrack.FormattingEnabled = true;\r
             this.drp_audioTrack.Items.AddRange(new object[] {\r
             "Automatic"});\r
-            this.drp_audioTrack.Location = new System.Drawing.Point(15, 35);\r
+            this.drp_audioTrack.Location = new System.Drawing.Point(15, 34);\r
             this.drp_audioTrack.Name = "drp_audioTrack";\r
             this.drp_audioTrack.Size = new System.Drawing.Size(194, 21);\r
             this.drp_audioTrack.TabIndex = 50;\r

diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs
index 1ed8427..6b96940 100644 (file)
--- a/win/C#/Controls/AudioPanel.cs
+++ b/win/C#/Controls/AudioPanel.cs
@@ -52,6 +52,7 @@ namespace Handbrake.Controls
             {\r
                 drp_audioEncoder.Items.Clear();\r
                 drp_audioEncoder.Items.Add("AAC (faac)");\r
+                drp_audioEncoder.Items.Add("MP3 (lame)");\r
                 drp_audioEncoder.Items.Add("AC3 Passthru");\r
                 if ((oldval != "AAC (faac)") && (oldval != "AC3 Passthru"))\r
                     drp_audioEncoder.SelectedIndex = 0;\r