Conflicts: gst/mpegtsmux/mpegtsmux.c Reverted back to 0.10 state as it wasn't really ported yet anyway.