God, this is pathetic... Can someone reenable -Wall/-Werror?

Original commit message from CVS:
God, this is pathetic... Can someone reenable -Wall/-Werror?
This commit is contained in:
Ronald S. Bultje 2004-06-14 01:26:15 +00:00
parent 03cbef5cc1
commit 3f9931de24

View file

@ -603,6 +603,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
* in this caps definition. */ * in this caps definition. */
caps = GST_FF_AUD_CAPS_NEW ("audio/x-adpcm", caps = GST_FF_AUD_CAPS_NEW ("audio/x-adpcm",
"layout", G_TYPE_STRING, layout, NULL); "layout", G_TYPE_STRING, layout, NULL);
if (context)
gst_caps_set_simple (caps,
"block_align", G_TYPE_INT, context->block_align,
"bitrate", G_TYPE_INT, context->bit_rate, NULL);
} while (0); } while (0);
break; break;
@ -649,6 +653,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
* in this caps definition. */ * in this caps definition. */
caps = GST_FF_AUD_CAPS_NEW ("audio/x-dpcm", caps = GST_FF_AUD_CAPS_NEW ("audio/x-dpcm",
"layout", G_TYPE_STRING, layout, NULL); "layout", G_TYPE_STRING, layout, NULL);
if (context)
gst_caps_set_simple (caps,
"block_align", G_TYPE_INT, context->block_align,
"bitrate", G_TYPE_INT, context->bit_rate, NULL);
} while (0); } while (0);
break; break;
@ -682,8 +690,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
mime = g_strdup_printf ("audio/x-gst_ff-%s", codec->name); mime = g_strdup_printf ("audio/x-gst_ff-%s", codec->name);
caps = GST_FF_AUD_CAPS_NEW (mime, NULL); caps = GST_FF_AUD_CAPS_NEW (mime, NULL);
if (context) if (context)
gst_caps_set (caps, "block_align", context->block_align, gst_caps_set_simple (caps,
"bitrate", context->bit_rate, NULL); "block_align", G_TYPE_INT, context->block_align,
"bitrate", G_TYPE_INT, context->bit_rate, NULL);
g_free (mime); g_free (mime);
break; break;
default: default: