Bug#986031: ogmrip: diff for NMU version 1.0.1-3.1
Control: tags 986031 + pending
Dear maintainer,
I've prepared an NMU for ogmrip (versioned as 1.0.1-3.1) and uploaded
it to DELAYED/2. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru ogmrip-1.0.1/debian/changelog ogmrip-1.0.1/debian/changelog
--- ogmrip-1.0.1/debian/changelog 2020-04-15 22:48:47.000000000 +0300
+++ ogmrip-1.0.1/debian/changelog 2021-06-15 18:53:43.000000000 +0300
@@ -1,3 +1,11 @@
+ogmrip (1.0.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patches from Bernhard Übelacker to fix crashes with
+ recent glib and libdvdread. (Closes: #986031)
+
+ -- Adrian Bunk <bunk@debian.org> Tue, 15 Jun 2021 18:53:43 +0300
+
ogmrip (1.0.1-3) unstable; urgency=medium
* Team upload
diff -Nru ogmrip-1.0.1/debian/patches/iso-file-segfault.patch ogmrip-1.0.1/debian/patches/iso-file-segfault.patch
--- ogmrip-1.0.1/debian/patches/iso-file-segfault.patch 1970-01-01 02:00:00.000000000 +0200
+++ ogmrip-1.0.1/debian/patches/iso-file-segfault.patch 2021-06-15 18:52:48.000000000 +0300
@@ -0,0 +1,14 @@
+Bug-Debian: https://bugs.debian.org/986031
+Last-Update: 2021-04-11
+
+--- ogmrip-1.0.1.orig/libogmdvd/ogmdvd-disc.c
++++ ogmrip-1.0.1/libogmdvd/ogmdvd-disc.c
+@@ -222,7 +222,7 @@ dvd_reader_get_menu_size (dvd_reader_t *
+
+ file = DVDOpenFile (reader, vts, DVD_READ_MENU_VOBS);
+ size = DVDFileSize (file);
+- DVDCloseFile (file);
++ if (file) DVDCloseFile (file);
+
+ size *= DVD_VIDEO_LB_LEN;
+ #else /* HAVE_DVD_FILE_SIZE */
diff -Nru ogmrip-1.0.1/debian/patches/series ogmrip-1.0.1/debian/patches/series
--- ogmrip-1.0.1/debian/patches/series 2020-04-15 22:46:52.000000000 +0300
+++ ogmrip-1.0.1/debian/patches/series 2021-06-15 18:53:43.000000000 +0300
@@ -1,3 +1,5 @@
01_libdvdread4.diff
02_configure.diff
enchant2.patch
+slashes-to-dashes.patch
+iso-file-segfault.patch
diff -Nru ogmrip-1.0.1/debian/patches/slashes-to-dashes.patch ogmrip-1.0.1/debian/patches/slashes-to-dashes.patch
--- ogmrip-1.0.1/debian/patches/slashes-to-dashes.patch 1970-01-01 02:00:00.000000000 +0200
+++ ogmrip-1.0.1/debian/patches/slashes-to-dashes.patch 2021-06-15 18:52:42.000000000 +0300
@@ -0,0 +1,304 @@
+Bug-Debian: https://bugs.debian.org/986031
+Last-Update: 2021-04-11
+
+--- ogmrip-1.0.1.orig/libogmrip-gtk/ogmrip-gconf-settings.c
++++ ogmrip-1.0.1/libogmrip-gtk/ogmrip-gconf-settings.c
+@@ -63,10 +63,10 @@ my_gconf_concat_dir_and_key (const gchar
+
+ strcpy (retval, dir);
+
+- if (dir[dirlen-1] == '/')
++ if (dir[dirlen-1] == '-')
+ {
+ /* dir ends in slash, strip key slash if needed */
+- if (*key == '/')
++ if (*key == '-')
+ ++key;
+
+ strcpy (retval + dirlen, key);
+@@ -76,9 +76,9 @@ my_gconf_concat_dir_and_key (const gchar
+ /* Dir doesn't end in slash, add slash if key lacks one. */
+ gchar* dest = retval + dirlen;
+
+- if (*key != '/')
++ if (*key != '-')
+ {
+- *dest = '/';
++ *dest = '-';
+ ++dest;
+ }
+
+--- ogmrip-1.0.1.orig/libogmrip-gtk/ogmrip-lavc-options.c
++++ ogmrip-1.0.1/libogmrip-gtk/ogmrip-lavc-options.c
+@@ -39,25 +39,25 @@
+ #define OGMRIP_IS_LAVC_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OGMRIP_TYPE_LAVC_DIALOG))
+ #define OGMRIP_IS_LAVC_DIALOG_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((klass), OGMRIP_TYPE_LAVC_DIALOG))
+
+-#define OGMRIP_LAVC_KEY_CMP OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_CMP
+-#define OGMRIP_LAVC_KEY_PRECMP OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_PRECMP
+-#define OGMRIP_LAVC_KEY_SUBCMP OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_SUBCMP
+-#define OGMRIP_LAVC_KEY_DIA OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_DIA
+-#define OGMRIP_LAVC_KEY_PREDIA OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_PREDIA
+-#define OGMRIP_LAVC_KEY_KEYINT OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_KEYINT
+-#define OGMRIP_LAVC_KEY_BUF_SIZE OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_BUF_SIZE
+-#define OGMRIP_LAVC_KEY_MIN_RATE OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_MIN_RATE
+-#define OGMRIP_LAVC_KEY_MAX_RATE OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_MAX_RATE
+-#define OGMRIP_LAVC_KEY_STRICT OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_STRICT
+-#define OGMRIP_LAVC_KEY_DC OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_DC
+-#define OGMRIP_LAVC_KEY_MBD OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_MBD
+-#define OGMRIP_LAVC_KEY_QNS OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_QNS
+-#define OGMRIP_LAVC_KEY_VB_STRATEGY OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_VB_STRATEGY
+-#define OGMRIP_LAVC_KEY_LAST_PRED OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_LAST_PRED
+-#define OGMRIP_LAVC_KEY_PREME OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_PREME
+-#define OGMRIP_LAVC_KEY_VQCOMP OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_VQCOMP
+-#define OGMRIP_LAVC_KEY_MV0 OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_MV0
+-#define OGMRIP_LAVC_KEY_V4MV OGMRIP_LAVC_SECTION "/" OGMRIP_LAVC_PROP_V4MV
++#define OGMRIP_LAVC_KEY_CMP OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_CMP
++#define OGMRIP_LAVC_KEY_PRECMP OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_PRECMP
++#define OGMRIP_LAVC_KEY_SUBCMP OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_SUBCMP
++#define OGMRIP_LAVC_KEY_DIA OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_DIA
++#define OGMRIP_LAVC_KEY_PREDIA OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_PREDIA
++#define OGMRIP_LAVC_KEY_KEYINT OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_KEYINT
++#define OGMRIP_LAVC_KEY_BUF_SIZE OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_BUF_SIZE
++#define OGMRIP_LAVC_KEY_MIN_RATE OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_MIN_RATE
++#define OGMRIP_LAVC_KEY_MAX_RATE OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_MAX_RATE
++#define OGMRIP_LAVC_KEY_STRICT OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_STRICT
++#define OGMRIP_LAVC_KEY_DC OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_DC
++#define OGMRIP_LAVC_KEY_MBD OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_MBD
++#define OGMRIP_LAVC_KEY_QNS OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_QNS
++#define OGMRIP_LAVC_KEY_VB_STRATEGY OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_VB_STRATEGY
++#define OGMRIP_LAVC_KEY_LAST_PRED OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_LAST_PRED
++#define OGMRIP_LAVC_KEY_PREME OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_PREME
++#define OGMRIP_LAVC_KEY_VQCOMP OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_VQCOMP
++#define OGMRIP_LAVC_KEY_MV0 OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_MV0
++#define OGMRIP_LAVC_KEY_V4MV OGMRIP_LAVC_SECTION "-" OGMRIP_LAVC_PROP_V4MV
+
+ typedef struct _OGMRipLavcDialog OGMRipLavcDialog;
+ typedef struct _OGMRipLavcDialogClass OGMRipLavcDialogClass;
+--- ogmrip-1.0.1.orig/libogmrip-gtk/ogmrip-x264-options.c
++++ ogmrip-1.0.1/libogmrip-gtk/ogmrip-x264-options.c
+@@ -41,32 +41,32 @@
+ #define OGMRIP_X264_PROP_PROFILE "profile"
+ #define OGMRIP_X264_DEFAULT_PROFILE OGMRIP_X264_PROFILE_HIGH
+
+-#define OGMRIP_X264_KEY_8X8DCT OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_8X8DCT
+-#define OGMRIP_X264_KEY_AUD OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_AUD
+-#define OGMRIP_X264_KEY_BFRAMES OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_BFRAMES
+-#define OGMRIP_X264_KEY_B_ADAPT OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_B_ADAPT
+-#define OGMRIP_X264_KEY_B_PYRAMID OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_B_PYRAMID
+-#define OGMRIP_X264_KEY_BRDO OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_BRDO
+-#define OGMRIP_X264_KEY_CABAC OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_CABAC
+-#define OGMRIP_X264_KEY_CQM OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_CQM
+-#define OGMRIP_X264_KEY_DIRECT OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_DIRECT
+-#define OGMRIP_X264_KEY_FRAMEREF OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_FRAMEREF
+-#define OGMRIP_X264_KEY_GLOBAL_HEADER OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_GLOBAL_HEADER
+-#define OGMRIP_X264_KEY_KEYINT OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_KEYINT
+-#define OGMRIP_X264_KEY_LEVEL_IDC OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_LEVEL_IDC
+-#define OGMRIP_X264_KEY_ME OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_ME
+-#define OGMRIP_X264_KEY_MERANGE OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_MERANGE
+-#define OGMRIP_X264_KEY_MIXED_REFS OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_MIXED_REFS
+-#define OGMRIP_X264_KEY_PARTITIONS OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_PARTITIONS
+-#define OGMRIP_X264_KEY_PROFILE OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_PROFILE
+-#define OGMRIP_X264_KEY_PSY_RD OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_PSY_RD
+-#define OGMRIP_X264_KEY_PSY_TRELLIS OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_PSY_TRELLIS
+-#define OGMRIP_X264_KEY_RC_LOOKAHEAD OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_RC_LOOKAHEAD
+-#define OGMRIP_X264_KEY_SUBQ OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_SUBQ
+-#define OGMRIP_X264_KEY_VBV_BUFSIZE OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_VBV_BUFSIZE
+-#define OGMRIP_X264_KEY_VBV_MAXRATE OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_VBV_MAXRATE
+-#define OGMRIP_X264_KEY_WEIGHT_B OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_WEIGHT_B
+-#define OGMRIP_X264_KEY_WEIGHT_P OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_WEIGHT_P
++#define OGMRIP_X264_KEY_8X8DCT OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_8X8DCT
++#define OGMRIP_X264_KEY_AUD OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_AUD
++#define OGMRIP_X264_KEY_BFRAMES OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_BFRAMES
++#define OGMRIP_X264_KEY_B_ADAPT OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_B_ADAPT
++#define OGMRIP_X264_KEY_B_PYRAMID OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_B_PYRAMID
++#define OGMRIP_X264_KEY_BRDO OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_BRDO
++#define OGMRIP_X264_KEY_CABAC OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_CABAC
++#define OGMRIP_X264_KEY_CQM OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_CQM
++#define OGMRIP_X264_KEY_DIRECT OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_DIRECT
++#define OGMRIP_X264_KEY_FRAMEREF OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_FRAMEREF
++#define OGMRIP_X264_KEY_GLOBAL_HEADER OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_GLOBAL_HEADER
++#define OGMRIP_X264_KEY_KEYINT OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_KEYINT
++#define OGMRIP_X264_KEY_LEVEL_IDC OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_LEVEL_IDC
++#define OGMRIP_X264_KEY_ME OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_ME
++#define OGMRIP_X264_KEY_MERANGE OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_MERANGE
++#define OGMRIP_X264_KEY_MIXED_REFS OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_MIXED_REFS
++#define OGMRIP_X264_KEY_PARTITIONS OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_PARTITIONS
++#define OGMRIP_X264_KEY_PROFILE OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_PROFILE
++#define OGMRIP_X264_KEY_PSY_RD OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_PSY_RD
++#define OGMRIP_X264_KEY_PSY_TRELLIS OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_PSY_TRELLIS
++#define OGMRIP_X264_KEY_RC_LOOKAHEAD OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_RC_LOOKAHEAD
++#define OGMRIP_X264_KEY_SUBQ OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_SUBQ
++#define OGMRIP_X264_KEY_VBV_BUFSIZE OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_VBV_BUFSIZE
++#define OGMRIP_X264_KEY_VBV_MAXRATE OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_VBV_MAXRATE
++#define OGMRIP_X264_KEY_WEIGHT_B OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_WEIGHT_B
++#define OGMRIP_X264_KEY_WEIGHT_P OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_WEIGHT_P
+
+ typedef struct _OGMRipX264Dialog OGMRipX264Dialog;
+ typedef struct _OGMRipX264DialogClass OGMRipX264DialogClass;
+@@ -500,7 +500,7 @@ ogmrip_init_options_plugin (void)
+ if (settings)
+ {
+ ogmrip_settings_install_key (settings,
+- g_param_spec_uint (OGMRIP_X264_SECTION "/" OGMRIP_X264_PROP_PROFILE, "Profile property", "Set profile",
++ g_param_spec_uint (OGMRIP_X264_SECTION "-" OGMRIP_X264_PROP_PROFILE, "Profile property", "Set profile",
+ OGMRIP_X264_PROFILE_BASELINE, OGMRIP_X264_PROFILE_HIGH, OGMRIP_X264_DEFAULT_PROFILE, G_PARAM_READWRITE));
+ }
+
+--- ogmrip-1.0.1.orig/libogmrip-gtk/ogmrip-xvid-options.c
++++ ogmrip-1.0.1/libogmrip-gtk/ogmrip-xvid-options.c
+@@ -38,32 +38,32 @@
+ #define OGMRIP_IS_XVID_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OGMRIP_TYPE_XVID_DIALOG))
+ #define OGMRIP_IS_XVID_DIALOG_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((klass), OGMRIP_TYPE_XVID_DIALOG))
+
+-#define OGMRIP_XVID_KEY_B_ADAPT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_B_ADAPT
+-#define OGMRIP_XVID_KEY_BFRAMES OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_BFRAMES
+-#define OGMRIP_XVID_KEY_BQUANT_OFFSET OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_BQUANT_OFFSET
+-#define OGMRIP_XVID_KEY_BQUANT_RATIO OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_BQUANT_RATIO
+-#define OGMRIP_XVID_KEY_BVHQ OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_BVHQ
+-#define OGMRIP_XVID_KEY_CHROMA_ME OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_CHROMA_ME
+-#define OGMRIP_XVID_KEY_CHROMA_OPT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_CHROMA_OPT
+-#define OGMRIP_XVID_KEY_CLOSED_GOP OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_CLOSED_GOP
+-#define OGMRIP_XVID_KEY_FRAME_DROP_RATIO OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_FRAME_DROP_RATIO
+-#define OGMRIP_XVID_KEY_GMC OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_GMC
+-#define OGMRIP_XVID_KEY_INTERLACING OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_INTERLACING
+-#define OGMRIP_XVID_KEY_MAX_BQUANT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_MAX_BQUANT
+-#define OGMRIP_XVID_KEY_MAX_IQUANT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_MAX_IQUANT
+-#define OGMRIP_XVID_KEY_MAX_PQUANT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_MAX_PQUANT
+-#define OGMRIP_XVID_KEY_ME_QUALITY OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_ME_QUALITY
+-#define OGMRIP_XVID_KEY_MIN_BQUANT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_MIN_BQUANT
+-#define OGMRIP_XVID_KEY_MIN_IQUANT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_MIN_IQUANT
+-#define OGMRIP_XVID_KEY_MIN_PQUANT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_MIN_PQUANT
+-#define OGMRIP_XVID_KEY_MAX_KEYINT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_MAX_KEYINT
+-#define OGMRIP_XVID_KEY_PACKED OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_PACKED
+-#define OGMRIP_XVID_KEY_PAR_HEIGHT OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_PAR_HEIGHT
+-#define OGMRIP_XVID_KEY_PAR OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_PAR
+-#define OGMRIP_XVID_KEY_PAR_WIDTH OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_PAR_WIDTH
+-#define OGMRIP_XVID_KEY_PROFILE OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_PROFILE
+-#define OGMRIP_XVID_KEY_QUANT_TYPE OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_QUANT_TYPE
+-#define OGMRIP_XVID_KEY_VHQ OGMRIP_XVID_SECTION "/" OGMRIP_XVID_PROP_VHQ
++#define OGMRIP_XVID_KEY_B_ADAPT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_B_ADAPT
++#define OGMRIP_XVID_KEY_BFRAMES OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_BFRAMES
++#define OGMRIP_XVID_KEY_BQUANT_OFFSET OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_BQUANT_OFFSET
++#define OGMRIP_XVID_KEY_BQUANT_RATIO OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_BQUANT_RATIO
++#define OGMRIP_XVID_KEY_BVHQ OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_BVHQ
++#define OGMRIP_XVID_KEY_CHROMA_ME OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_CHROMA_ME
++#define OGMRIP_XVID_KEY_CHROMA_OPT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_CHROMA_OPT
++#define OGMRIP_XVID_KEY_CLOSED_GOP OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_CLOSED_GOP
++#define OGMRIP_XVID_KEY_FRAME_DROP_RATIO OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_FRAME_DROP_RATIO
++#define OGMRIP_XVID_KEY_GMC OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_GMC
++#define OGMRIP_XVID_KEY_INTERLACING OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_INTERLACING
++#define OGMRIP_XVID_KEY_MAX_BQUANT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_MAX_BQUANT
++#define OGMRIP_XVID_KEY_MAX_IQUANT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_MAX_IQUANT
++#define OGMRIP_XVID_KEY_MAX_PQUANT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_MAX_PQUANT
++#define OGMRIP_XVID_KEY_ME_QUALITY OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_ME_QUALITY
++#define OGMRIP_XVID_KEY_MIN_BQUANT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_MIN_BQUANT
++#define OGMRIP_XVID_KEY_MIN_IQUANT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_MIN_IQUANT
++#define OGMRIP_XVID_KEY_MIN_PQUANT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_MIN_PQUANT
++#define OGMRIP_XVID_KEY_MAX_KEYINT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_MAX_KEYINT
++#define OGMRIP_XVID_KEY_PACKED OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_PACKED
++#define OGMRIP_XVID_KEY_PAR_HEIGHT OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_PAR_HEIGHT
++#define OGMRIP_XVID_KEY_PAR OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_PAR
++#define OGMRIP_XVID_KEY_PAR_WIDTH OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_PAR_WIDTH
++#define OGMRIP_XVID_KEY_PROFILE OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_PROFILE
++#define OGMRIP_XVID_KEY_QUANT_TYPE OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_QUANT_TYPE
++#define OGMRIP_XVID_KEY_VHQ OGMRIP_XVID_SECTION "-" OGMRIP_XVID_PROP_VHQ
+
+ typedef struct _OGMRipXvidDialog OGMRipXvidDialog;
+ typedef struct _OGMRipXvidDialogClass OGMRipXvidDialogClass;
+--- ogmrip-1.0.1.orig/src/ogmrip-gconf.h
++++ ogmrip-1.0.1/src/ogmrip-gconf.h
+@@ -58,54 +58,54 @@ G_BEGIN_DECLS
+
+ #define OGMRIP_GCONF_CONTAINER "container"
+
+-#define OGMRIP_GCONF_CONTAINER_FORMAT OGMRIP_GCONF_CONTAINER "/format"
+-#define OGMRIP_GCONF_CONTAINER_FOURCC OGMRIP_GCONF_CONTAINER "/fourcc"
+-#define OGMRIP_GCONF_CONTAINER_TNUMBER OGMRIP_GCONF_CONTAINER "/target_number"
+-#define OGMRIP_GCONF_CONTAINER_TSIZE OGMRIP_GCONF_CONTAINER "/target_size"
+-#define OGMRIP_GCONF_CONTAINER_ENSURE_SYNC OGMRIP_GCONF_CONTAINER "/ensure_sync"
++#define OGMRIP_GCONF_CONTAINER_FORMAT OGMRIP_GCONF_CONTAINER "-format"
++#define OGMRIP_GCONF_CONTAINER_FOURCC OGMRIP_GCONF_CONTAINER "-fourcc"
++#define OGMRIP_GCONF_CONTAINER_TNUMBER OGMRIP_GCONF_CONTAINER "-target_number"
++#define OGMRIP_GCONF_CONTAINER_TSIZE OGMRIP_GCONF_CONTAINER "-target_size"
++#define OGMRIP_GCONF_CONTAINER_ENSURE_SYNC OGMRIP_GCONF_CONTAINER "-ensure_sync"
+
+ #define OGMRIP_GCONF_VIDEO "video"
+
+-#define OGMRIP_GCONF_VIDEO_CODEC OGMRIP_GCONF_VIDEO "/codec"
+-#define OGMRIP_GCONF_VIDEO_PASSES OGMRIP_GCONF_VIDEO "/passes"
+-#define OGMRIP_GCONF_VIDEO_PRESET OGMRIP_GCONF_VIDEO "/preset"
+-#define OGMRIP_GCONF_VIDEO_SCALER OGMRIP_GCONF_VIDEO "/scaler"
+-#define OGMRIP_GCONF_VIDEO_DENOISE OGMRIP_GCONF_VIDEO "/denoise"
+-#define OGMRIP_GCONF_VIDEO_TRELLIS OGMRIP_GCONF_VIDEO "/trellis"
+-#define OGMRIP_GCONF_VIDEO_QPEL OGMRIP_GCONF_VIDEO "/qpel"
+-#define OGMRIP_GCONF_VIDEO_DEBLOCK OGMRIP_GCONF_VIDEO "/deblock"
+-#define OGMRIP_GCONF_VIDEO_DERING OGMRIP_GCONF_VIDEO "/dering"
+-#define OGMRIP_GCONF_VIDEO_TURBO OGMRIP_GCONF_VIDEO "/turbo"
+-#define OGMRIP_GCONF_VIDEO_ASPECT OGMRIP_GCONF_VIDEO "/aspect_ratio"
+-
+-#define OGMRIP_GCONF_VIDEO_ENCODING OGMRIP_GCONF_VIDEO "/encoding"
+-#define OGMRIP_GCONF_VIDEO_BITRATE OGMRIP_GCONF_VIDEO "/bitrate"
+-#define OGMRIP_GCONF_VIDEO_QUANTIZER OGMRIP_GCONF_VIDEO "/quantizer"
+-#define OGMRIP_GCONF_VIDEO_BPP OGMRIP_GCONF_VIDEO "/bpp"
+-
+-#define OGMRIP_GCONF_VIDEO_CAN_CROP OGMRIP_GCONF_VIDEO "/can_crop"
+-#define OGMRIP_GCONF_VIDEO_CAN_SCALE OGMRIP_GCONF_VIDEO "/can_scale"
+-#define OGMRIP_GCONF_VIDEO_MIN_WIDTH OGMRIP_GCONF_VIDEO "/min_width"
+-#define OGMRIP_GCONF_VIDEO_MIN_HEIGHT OGMRIP_GCONF_VIDEO "/min_height"
+-#define OGMRIP_GCONF_VIDEO_MAX_WIDTH OGMRIP_GCONF_VIDEO "/max_width"
+-#define OGMRIP_GCONF_VIDEO_MAX_HEIGHT OGMRIP_GCONF_VIDEO "/max_height"
+-#define OGMRIP_GCONF_VIDEO_EXPAND OGMRIP_GCONF_VIDEO "/expand"
++#define OGMRIP_GCONF_VIDEO_CODEC OGMRIP_GCONF_VIDEO "-codec"
++#define OGMRIP_GCONF_VIDEO_PASSES OGMRIP_GCONF_VIDEO "-passes"
++#define OGMRIP_GCONF_VIDEO_PRESET OGMRIP_GCONF_VIDEO "-preset"
++#define OGMRIP_GCONF_VIDEO_SCALER OGMRIP_GCONF_VIDEO "-scaler"
++#define OGMRIP_GCONF_VIDEO_DENOISE OGMRIP_GCONF_VIDEO "-denoise"
++#define OGMRIP_GCONF_VIDEO_TRELLIS OGMRIP_GCONF_VIDEO "-trellis"
++#define OGMRIP_GCONF_VIDEO_QPEL OGMRIP_GCONF_VIDEO "-qpel"
++#define OGMRIP_GCONF_VIDEO_DEBLOCK OGMRIP_GCONF_VIDEO "-deblock"
++#define OGMRIP_GCONF_VIDEO_DERING OGMRIP_GCONF_VIDEO "-dering"
++#define OGMRIP_GCONF_VIDEO_TURBO OGMRIP_GCONF_VIDEO "-turbo"
++#define OGMRIP_GCONF_VIDEO_ASPECT OGMRIP_GCONF_VIDEO "-aspect_ratio"
++
++#define OGMRIP_GCONF_VIDEO_ENCODING OGMRIP_GCONF_VIDEO "-encoding"
++#define OGMRIP_GCONF_VIDEO_BITRATE OGMRIP_GCONF_VIDEO "-bitrate"
++#define OGMRIP_GCONF_VIDEO_QUANTIZER OGMRIP_GCONF_VIDEO "-quantizer"
++#define OGMRIP_GCONF_VIDEO_BPP OGMRIP_GCONF_VIDEO "-bpp"
++
++#define OGMRIP_GCONF_VIDEO_CAN_CROP OGMRIP_GCONF_VIDEO "-can_crop"
++#define OGMRIP_GCONF_VIDEO_CAN_SCALE OGMRIP_GCONF_VIDEO "-can_scale"
++#define OGMRIP_GCONF_VIDEO_MIN_WIDTH OGMRIP_GCONF_VIDEO "-min_width"
++#define OGMRIP_GCONF_VIDEO_MIN_HEIGHT OGMRIP_GCONF_VIDEO "-min_height"
++#define OGMRIP_GCONF_VIDEO_MAX_WIDTH OGMRIP_GCONF_VIDEO "-max_width"
++#define OGMRIP_GCONF_VIDEO_MAX_HEIGHT OGMRIP_GCONF_VIDEO "-max_height"
++#define OGMRIP_GCONF_VIDEO_EXPAND OGMRIP_GCONF_VIDEO "-expand"
+
+ #define OGMRIP_GCONF_AUDIO "audio"
+
+-#define OGMRIP_GCONF_AUDIO_CODEC OGMRIP_GCONF_AUDIO "/codec"
+-#define OGMRIP_GCONF_AUDIO_QUALITY OGMRIP_GCONF_AUDIO "/quality"
+-#define OGMRIP_GCONF_AUDIO_CHANNELS OGMRIP_GCONF_AUDIO "/channels"
+-#define OGMRIP_GCONF_AUDIO_SRATE OGMRIP_GCONF_AUDIO "/srate"
+-#define OGMRIP_GCONF_AUDIO_NORMALIZE OGMRIP_GCONF_AUDIO "/normalize"
++#define OGMRIP_GCONF_AUDIO_CODEC OGMRIP_GCONF_AUDIO "-codec"
++#define OGMRIP_GCONF_AUDIO_QUALITY OGMRIP_GCONF_AUDIO "-quality"
++#define OGMRIP_GCONF_AUDIO_CHANNELS OGMRIP_GCONF_AUDIO "-channels"
++#define OGMRIP_GCONF_AUDIO_SRATE OGMRIP_GCONF_AUDIO "-srate"
++#define OGMRIP_GCONF_AUDIO_NORMALIZE OGMRIP_GCONF_AUDIO "-normalize"
+
+ #define OGMRIP_GCONF_SUBP "subp"
+
+-#define OGMRIP_GCONF_SUBP_CODEC OGMRIP_GCONF_SUBP "/codec"
+-#define OGMRIP_GCONF_SUBP_CHARSET OGMRIP_GCONF_SUBP "/charset"
+-#define OGMRIP_GCONF_SUBP_NEWLINE OGMRIP_GCONF_SUBP "/newline"
+-#define OGMRIP_GCONF_FORCED_SUBS OGMRIP_GCONF_SUBP "/forced"
+-#define OGMRIP_GCONF_SPELL_CHECK OGMRIP_GCONF_SUBP "/spell_check"
++#define OGMRIP_GCONF_SUBP_CODEC OGMRIP_GCONF_SUBP "-codec"
++#define OGMRIP_GCONF_SUBP_CHARSET OGMRIP_GCONF_SUBP "-charset"
++#define OGMRIP_GCONF_SUBP_NEWLINE OGMRIP_GCONF_SUBP "-newline"
++#define OGMRIP_GCONF_FORCED_SUBS OGMRIP_GCONF_SUBP "-forced"
++#define OGMRIP_GCONF_SPELL_CHECK OGMRIP_GCONF_SUBP "-spell_check"
+
+ /*
+ * Default preferences
Reply to: