summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <jstebbins.hb@gmail.com>2012-07-17 18:02:33 +0000
committerjstebbins <jstebbins.hb@gmail.com>2012-07-17 18:02:33 +0000
commit219dbe861263c1f1c9111e0cdd8b97bcadca99cb (patch)
treefa12d45337bf3b05510e9fa42edabaa49c926db2 /gtk
parent00d56021b89743ba16aa5f24b8b953dd040c4a36 (diff)
LinGui: Fix preset import of new framerates
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4859 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/callbacks.c26
-rw-r--r--gtk/src/presets.c4
2 files changed, 23 insertions, 7 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 8e710e53a..01edebf2f 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -2619,13 +2619,25 @@ working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
}
if(status->seconds > -1)
{
- status_str= g_strdup_printf(
- "Encoding: %s%s%.2f %%"
- " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
- job_str, task_str,
- 100.0 * status->progress,
- status->rate_cur, status->rate_avg, status->hours,
- status->minutes, status->seconds );
+ if (status->rate_cur > 0.0)
+ {
+ status_str= g_strdup_printf(
+ "Encoding: %s%s%.2f %%"
+ " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
+ job_str, task_str,
+ 100.0 * status->progress,
+ status->rate_cur, status->rate_avg, status->hours,
+ status->minutes, status->seconds );
+ }
+ else
+ {
+ status_str= g_strdup_printf(
+ "Encoding: %s%s%.2f %%"
+ " (ETA %02dh%02dm%02ds)",
+ job_str, task_str,
+ 100.0 * status->progress,
+ status->hours, status->minutes, status->seconds );
+ }
}
else
{
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 56b9466e5..809ede24e 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -2049,6 +2049,10 @@ value_map_t framerate_xlat[] =
{"24", "24"},
{"25 (PAL Film/Video)", "25"},
{"29.97 (NTSC Video)", "29.97"},
+ {"30", "30"},
+ {"50", "50"},
+ {"59.94", "59.94"},
+ {"60", "60"},
{NULL, NULL}
};