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

[Matthias Clasen <matthiasc src gnome org>]

commit 00d25ae89cbb07a68ba19e85204db956710a0618
Merge: e888364d3c 86b5dba43b
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 14 18:44:10 2021 +0000

    Merge branch 'media-stream-name-collision' into 'master'
    
    mediastream: Rename an api to avoid name collisions
    
    Closes #4023
    
    See merge request GNOME/gtk!3667

 demos/gtk-demo/paintable_mediastream.c | 10 +++---
 gtk/gtkmediafile.c                     |  2 +-
 gtk/gtkmediastream.c                   | 56 +++++++++++++++++++++++++++++-----
 gtk/gtkmediastream.h                   | 13 ++++++--
 modules/media/gtkffmediafile.c         | 14 ++++-----
 modules/media/gtkgstmediafile.c        | 20 ++++++------
 6 files changed, 82 insertions(+), 33 deletions(-)
---