[gtk: 2/2] Merge branch 'media-stream-name-collision' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 10564514e80f1189d69bbeb50b4f292f2b9ff13c
Merge: 56c486abbf 96fc5dc3a7
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jun 16 10:07:29 2021 +0000

    Merge branch 'media-stream-name-collision' into 'master'
    
    mediastream: Some more api renaming
    
    Closes #4023
    
    See merge request GNOME/gtk!3673

 demos/gtk-demo/paintable_mediastream.c |  2 +-
 gtk/gtkmediastream.c                   | 29 +++++++++++++++++++++++++----
 gtk/gtkmediastream.h                   |  4 +++-
 modules/media/gtkgstmediafile.c        |  2 +-
 4 files changed, 30 insertions(+), 7 deletions(-)
---