Attachment #160288 for bug #230509




  GString *options;

  const gchar *output, *codec;
  gint bitrate, vid, threads;
  guint cmp, precmp, subcmp;

  g_return_val_if_fail (OGMRIP_IS_VIDEO_CODEC (video), NULL);


  if (lavc->priv->max_rate > 0)
    g_string_append_printf (options, ":vrc_maxrate=%u", lavc->priv->max_rate);

  if (lavc->priv->cmp != 0 || lavc->priv->precmp != 0 || lavc->priv->subcmp != 0)
    g_string_append_printf (options, ":precmp=%u:subcmp=%u:cmp=%u", lavc->priv->precmp, lavc->priv->subcmp, lavc->priv->cmp);

  if (lavc->priv->dia != 1 || lavc->priv->predia != 1)
    g_string_append_printf (options, ":dia=%d:predia=%d", lavc->priv->dia, lavc->priv->predia);

  if (lavc->priv->header != 0)
    g_string_append_printf (options, ":vglobal=%d", lavc->priv->header);

  g_string_append_printf (options, ":vmax_b_frames=%d", ogmrip_video_codec_get_max_b_frames (video));


Lines 572-579 Link Here

(-)libogmrip.orig/ogmrip-video-codec.c (-2 / +2 lines)
572	{	572	{
573	guint scale_width, scale_height;	573	guint scale_width, scale_height;
574		574
575	ogmrip_video_codec_get_scale_size (video, &scale_width, &scale_height);	575	if (ogmrip_video_codec_get_scale_size (video, &scale_width, &scale_height) &&
576	if (scale_width > max_width \|\| scale_height > max_height)	576	(scale_width > max_width \|\| scale_height > max_height))
577	{	577	{
578	gdouble ratio = scale_width / (gdouble) scale_height;	578	gdouble ratio = scale_width / (gdouble) scale_height;
579		579

Return to bug 230509

Lines 125-132 Link Here

(-)libogmrip.orig/ogmrip-lavc.c (-8 / +7 lines)
125	GString *options;	125	GString *options;
126		126
127	const gchar output, codec;	127	const gchar output, codec;
128	gint bitrate, vid, dia, predia, header, threads;	128	gint bitrate, vid, threads;
129	guint cmp, precmp, subcmp;
130		129
131	g_return_val_if_fail (OGMRIP_IS_VIDEO_CODEC (video), NULL);	130	g_return_val_if_fail (OGMRIP_IS_VIDEO_CODEC (video), NULL);
132		131
Lines 183-196 Link Here
183	if (lavc->priv->max_rate > 0)	182	if (lavc->priv->max_rate > 0)
184	g_string_append_printf (options, ":vrc_maxrate=%u", lavc->priv->max_rate);	183	g_string_append_printf (options, ":vrc_maxrate=%u", lavc->priv->max_rate);
185		184
186	ogmrip_lavc_get_cmp (OGMRIP_LAVC (video), &cmp, &precmp, &subcmp);	185	if (lavc->priv->cmp != 0 \|\| lavc->priv->precmp != 0 \|\| lavc->priv->subcmp != 0)
187	g_string_append_printf (options, ":precmp=%u:subcmp=%u:cmp=%u", precmp, subcmp, cmp);	186	g_string_append_printf (options, ":precmp=%u:subcmp=%u:cmp=%u", lavc->priv->precmp, lavc->priv->subcmp, lavc->priv->cmp);
188		187
189	ogmrip_lavc_get_dia (OGMRIP_LAVC (video), &dia, &predia);	188	if (lavc->priv->dia != 1 \|\| lavc->priv->predia != 1)
190	g_string_append_printf (options, ":dia=%d:predia=%d", dia, predia);	189	g_string_append_printf (options, ":dia=%d:predia=%d", lavc->priv->dia, lavc->priv->predia);
191		190
192	header = ogmrip_lavc_get_header (OGMRIP_LAVC (video));	191	if (lavc->priv->header != 0)
193	g_string_append_printf (options, ":vglobal=%d", header);	192	g_string_append_printf (options, ":vglobal=%d", lavc->priv->header);
194		193
195	g_string_append_printf (options, ":vmax_b_frames=%d", ogmrip_video_codec_get_max_b_frames (video));	194	g_string_append_printf (options, ":vmax_b_frames=%d", ogmrip_video_codec_get_max_b_frames (video));
196		195