Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2012-02-14 10:35:06 +01:00
commit ebf502d1c6

View file

@ -2370,12 +2370,11 @@ push:
}
seen_key = FALSE;
}
} else {
seen_delta = TRUE;
} else {
seen_key = TRUE;
}
seen_key |= !GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
parse->priv->buffers_send =
g_slist_prepend (parse->priv->buffers_send, buf);
parse->priv->buffers_queued =