-
Wim Taymans authored
Conflicts: ext/flac/gstflacenc.c ext/jack/gstjackaudioclient.c ext/jack/gstjackaudiosink.c ext/jack/gstjackaudiosrc.c ext/pulse/plugin.c ext/shout2/gstshout2.c gst/matroska/matroska-mux.c gst/rtp/gstrtph264pay.c
225e98d6
Conflicts: ext/flac/gstflacenc.c ext/jack/gstjackaudioclient.c ext/jack/gstjackaudiosink.c ext/jack/gstjackaudiosrc.c ext/pulse/plugin.c ext/shout2/gstshout2.c gst/matroska/matroska-mux.c gst/rtp/gstrtph264pay.c