Skip to content

Commit d5dcc98

Browse files
committed
4.8.1.0 fix cannot encode video that has no audio
Fix cannot encode video that has no audio Fix linux update issue, use bundled 7za
1 parent 7bdddd3 commit d5dcc98

File tree

5 files changed

+37
-30
lines changed

5 files changed

+37
-30
lines changed

changelog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 4.8.1.0
2+
---------------
3+
[fixed] Video cannot encode due to AVI indexing problem
4+
[fixed] Update system under Linux (missing "./")
5+
[fixed] Cannot encode video that has no audio
6+
17
Version 4.8.0.0
28
---------------
39
From here, IFME change new icon again.

ifme.framework/ShellScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class ShellScript
5151
"rm -r -f \"$2\"\n" +
5252
"mkdir $2\n" +
5353
"wget --no-check-certificate -O \"./saishin.jp\" $1\n" +
54-
"7za x -so \"./saishin.jp\" | tar xf - -C \"$2\"\n" +
54+
"./7za x -so \"./saishin.jp\" | tar xf - -C \"$2\"\n" +
5555
"echo \" \"\n" +
5656
"echo \" \"\n" +
5757
"echo \"Update complete!\"\n" +

ifme/frmAbout.cs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void frmAbout_Load(object sender, EventArgs e)
8383
{
8484
LoadLang();
8585
lblTitle.Text = String.Format("{0} {1}",Title, Version);
86-
lblAuthorInfo.Text = String.Format("Compiled on: {0} ({1} build)\nCopyleft (ɔ) 2013 - {2} Anime4000, GNU GPL v2", BuildDate, CPU, DateTime.Today.Year.ToString());
86+
lblAuthorInfo.Text = String.Format("Compiled on: {0} ({1} build)\nCopyright © 2013 - {2} Anime4000, GNU GPL v2", BuildDate, CPU, DateTime.Today.Year);
8787
this.Text = String.Format(this.Text, "About", Globals.AppInfo.Name);
8888

8989
if (!Globals.AppInfo.VersionEqual)
@@ -94,22 +94,6 @@ private void frmAbout_Load(object sender, EventArgs e)
9494

9595
// Get first
9696
Names[cnt++] = "People @ MulticoreWare";
97-
Names[cnt++] = "Pis Kawaii Neko";
98-
99-
// Get Names for Langauge author
100-
for (int i = 0; i < Language.Installed.Data.GetLength(0); i++)
101-
{
102-
if (Language.Installed.Data[i, 0] == null)
103-
break;
104-
105-
if (String.Equals(Language.Installed.Data[i, 2], "Anime4000"))
106-
continue;
107-
108-
if (Language.Installed.Data[i, 2].Contains("//"))
109-
continue;
110-
111-
Names[cnt++] = Language.Installed.Data[i, 2];
112-
}
11397

11498
// Get Names for Addons author
11599
for (int i = 0; i < Addons.Installed.Data.GetLength(0); i++)
@@ -132,6 +116,21 @@ private void frmAbout_Load(object sender, EventArgs e)
132116
Names[cnt++] = Addons.Installed.Data[i, 3];
133117
}
134118

119+
// Get Names for Langauge author
120+
for (int i = 0; i < Language.Installed.Data.GetLength(0); i++)
121+
{
122+
if (Language.Installed.Data[i, 0] == null)
123+
break;
124+
125+
if (String.Equals(Language.Installed.Data[i, 2], "Anime4000"))
126+
continue;
127+
128+
if (Language.Installed.Data[i, 2].Contains("//"))
129+
continue;
130+
131+
Names[cnt++] = Language.Installed.Data[i, 2];
132+
}
133+
135134
Names[cnt++] = "FFmpeg Team";
136135
Names[cnt++] = "Xiph.Org Foundation";
137136
tmrScroll.Start();

ifme/frmMain.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ private void btnQueueAdd_Click(object sender, EventArgs e)
209209
{
210210
OpenFileDialog GetFiles = new OpenFileDialog();
211211
GetFiles.Title = Language.IMessage.OpenFile;
212-
GetFiles.Filter = "Known Video files|*.mkv;*.mp4;*.m4v;*.flv;*.webm;*.avi;*.divx;*.wmv;*.mpg;*.mpeg;*.mpv;*.m1v;*.dat;*.vob;*.emp;*.emm|"
213-
+ "MKV Container|*.mkv|"
214-
+ "MP4 Container|*.mp4;*.m4v|"
215-
+ "Flash Video Container|*.flv|"
216-
+ "The WebM Project (container)|*.webm|"
212+
GetFiles.Filter = "Supported video files|*.mkv;*.mp4;*.m4v;*.flv;*.webm;*.avi;*.divx;*.wmv;*.mpg;*.mpeg;*.mpv;*.m1v;*.dat;*.vob;*.emp;*.emm|"
213+
+ "Matroska Multimedia Container|*.mkv|"
214+
+ "MPEG-4 Part 14 (MP4)|*.mp4;*.m4v|"
215+
+ "Adobe Flash Video|*.flv|"
216+
+ "The WebM Project|*.webm|"
217217
+ "Audio Video Interleaved|*.avi;*.divx|"
218218
+ "Windows Media Video|*.wmv|"
219219
+ "Moving Picture Experts Group|*.mpg;*.mpeg;*.mpv;*.m1v;*.dat;*.vob|"
@@ -1224,16 +1224,16 @@ private void BGThread_DoWork(object sender, DoWorkEventArgs e)
12241224
// Decode audio and process multiple streams
12251225
if (!BGThread.CancellationPending)
12261226
{
1227-
// Set title
1228-
FormTitle(String.Format("Queue {0} of {1}: Decoding all audio...", x + 1, queue.Length));
1229-
InvokeLog(Log.Info, "Now decoding audio~ Please Wait...");
1230-
12311227
if (audio.Count >= 1)
12321228
{
1229+
// Set title
1230+
FormTitle(String.Format("Queue {0} of {1}: Decoding all audio...", x + 1, queue.Length));
1231+
InvokeLog(Log.Info, "Now decoding audio~ Please Wait...");
1232+
12331233
// Capture MediaInfo Audio ID and assigned to FFmpeg Map ID
12341234
int[] AudioMapID = new int[1024];
12351235

1236-
if(video[0].Id == 0 || audio[0].Id == 0 || audio[0].Id == 1)
1236+
if(video[0].Id == 0 || audio[0].Id == 1 || audio[0].Id == 0)
12371237
for (int i = 0; i < audio.Count; i++)
12381238
AudioMapID[i] = audio[i].Id;
12391239
else
@@ -1320,7 +1320,7 @@ private void BGThread_DoWork(object sender, DoWorkEventArgs e)
13201320
if (!BGThread.CancellationPending)
13211321
{
13221322
// Make sure not pass-through mode
1323-
if (AudFormat != 0)
1323+
if (audio.Count >= 1 && AudFormat != 0)
13241324
{
13251325
// Set title
13261326
FormTitle(String.Format("Queue {0} of {1}: Encoding all audio...", x + 1, queue.Length));
@@ -2114,7 +2114,7 @@ private void pictDonate_Click(object sender, EventArgs e)
21142114

21152115
private void btnAdvanceHelp_Click(object sender, EventArgs e)
21162116
{
2117-
System.Diagnostics.Process.Start("http://x265.readthedocs.org/en/default/");
2117+
System.Diagnostics.Process.Start("http://x265.readthedocs.org/en/default/cli.html");
21182118
}
21192119
}
21202120
}

ifme/frmProperties.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ public frmProperties(string ScreenRes)
1919
{
2020
InitializeComponent();
2121
this.Icon = Properties.Resources.ifme_flat;
22+
2223
OldScreenRes = ScreenRes.Contains('p') || ScreenRes.Contains('i') ? ScreenRes.Remove(ScreenRes.Length - 1) : ScreenRes;
24+
NewScreenRes = OldScreenRes;
2325
ScanType = ScreenRes.Contains('i') ? 'i' : 'p';
2426
}
2527

0 commit comments

Comments
 (0)