-
Wim Taymans authored
Conflicts: gst/avi/gstavidemux.c gst/rtp/gstrtpac3depay.c gst/rtp/gstrtpg726depay.c gst/rtp/gstrtpmpvdepay.c gst/videofilter/gstgamma.c
d89790d5
Conflicts: gst/avi/gstavidemux.c gst/rtp/gstrtpac3depay.c gst/rtp/gstrtpg726depay.c gst/rtp/gstrtpmpvdepay.c gst/videofilter/gstgamma.c