vp9enc: Don't dereference NULL checks

CID #1197703
This commit is contained in:
Edward Hervey 2014-05-20 08:20:42 +02:00
parent 32d8eb9f80
commit 5263f91e13

View file

@ -886,18 +886,20 @@ gst_vp9_enc_set_property (GObject * object, guint prop_id,
memset (&gst_vp9_enc->cfg.ts_target_bitrate, 0, memset (&gst_vp9_enc->cfg.ts_target_bitrate, 0,
sizeof (gst_vp9_enc->cfg.ts_target_bitrate)); sizeof (gst_vp9_enc->cfg.ts_target_bitrate));
if (va == NULL) {
gst_vp9_enc->n_ts_target_bitrate = 0;
} else {
if (va->n_values > VPX_TS_MAX_LAYERS) { if (va->n_values > VPX_TS_MAX_LAYERS) {
g_warning ("%s: Only %d layers allowed at maximum", g_warning ("%s: Only %d layers allowed at maximum",
GST_ELEMENT_NAME (gst_vp9_enc), VPX_TS_MAX_LAYERS); GST_ELEMENT_NAME (gst_vp9_enc), VPX_TS_MAX_LAYERS);
} else if (va) { } else {
gint i; gint i;
for (i = 0; i < va->n_values; i++) for (i = 0; i < va->n_values; i++)
gst_vp9_enc->cfg.ts_target_bitrate[i] = gst_vp9_enc->cfg.ts_target_bitrate[i] =
g_value_get_int (g_value_array_get_nth (va, i)); g_value_get_int (g_value_array_get_nth (va, i));
gst_vp9_enc->n_ts_target_bitrate = va->n_values; gst_vp9_enc->n_ts_target_bitrate = va->n_values;
} else { }
gst_vp9_enc->n_ts_target_bitrate = 0;
} }
global = TRUE; global = TRUE;
break; break;