diff options
| author | jstebbins <[email protected]> | 2009-07-09 22:25:48 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-07-09 22:25:48 +0000 |
| commit | 432cdbe8c6fceb55021b4a39fdd8d28e2cf3112d (patch) | |
| tree | 1b8483b1106a04395962110715552e00d7693675 /gtk | |
| parent | 765a8bc3a84b72b1e7db0c671cae417d3e46b891 (diff) | |
LinGui: fix behavior when changing storage height in custom anamorphic mode
when the storage height changes, update the display height before making
other calculations. otherwise, the change has affects on display width.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2678 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/src/hb-backend.c | 4 | ||||
| -rw-r--r-- | gtk/src/x264handler.c | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index c37006fa9..89b0c7599 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -3163,9 +3163,7 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) job->anamorphic.dar_width = ghb_settings_get_int(ud->settings, "PictureDisplayWidth"); - job->anamorphic.dar_height = - ghb_settings_get_int(ud->settings, - "PictureDisplayHeight"); + job->anamorphic.dar_height = height; } } else diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c index 17c67db36..658d16fb5 100644 --- a/gtk/src/x264handler.c +++ b/gtk/src/x264handler.c @@ -170,21 +170,21 @@ find_syn_match(const gchar *opt, gchar **syns) struct x264_opt_map_s x264_opt_map[] = { - {x264_ref_syns, "x264_refs", "1", X264_OPT_INT}, - {x264_mixed_syns, "x264_mixed_refs", "0", X264_OPT_BOOL}, - {x264_bframes_syns, "x264_bframes", "0", X264_OPT_INT}, + {x264_ref_syns, "x264_refs", "3", X264_OPT_INT}, + {x264_mixed_syns, "x264_mixed_refs", "1", X264_OPT_BOOL}, + {x264_bframes_syns, "x264_bframes", "3", X264_OPT_INT}, {x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO}, {x264_badapt_syns, "x264_b_adapt", "1", X264_OPT_COMBO}, - {x264_weightb_syns, "x264_weighted_bframes", "0", X264_OPT_BOOL}, + {x264_weightb_syns, "x264_weighted_bframes", "1", X264_OPT_BOOL}, {x264_bpyramid_syns, "x264_bpyramid", "0", X264_OPT_BOOL}, {x264_me_syns, "x264_me", "hex", X264_OPT_COMBO}, {x264_merange_syns, "x264_merange", "16", X264_OPT_INT}, - {x264_subme_syns, "x264_subme", "6", X264_OPT_COMBO}, + {x264_subme_syns, "x264_subme", "7", X264_OPT_COMBO}, {x264_analyse_syns, "x264_analyse", "some", X264_OPT_COMBO}, - {x264_8x8dct_syns, "x264_8x8dct", "0", X264_OPT_BOOL}, + {x264_8x8dct_syns, "x264_8x8dct", "1", X264_OPT_BOOL}, {x264_deblock_syns, "x264_deblock_alpha", "0,0", X264_OPT_DEBLOCK}, {x264_deblock_syns, "x264_deblock_beta", "0,0", X264_OPT_DEBLOCK}, - {x264_trellis_syns, "x264_trellis", "0", X264_OPT_COMBO}, + {x264_trellis_syns, "x264_trellis", "1", X264_OPT_COMBO}, {x264_pskip_syns, "x264_no_fast_pskip", "0", X264_OPT_BOOL}, {x264_decimate_syns, "x264_no_dct_decimate", "0", X264_OPT_BOOL}, {x264_cabac_syns, "x264_cabac", "1", X264_OPT_BOOL}, |