[gtk: 2/2] Merge branch 'rerename-mediastream' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 390447862ab0f62a28e7b0e7ba99a96b99b75581
Merge: c88dc98b7c 3227aa2c45
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Sat Jul 3 13:28:35 2021 +0000

    Merge branch 'rerename-mediastream' into 'master'
    
    mediastream: Rename apis one more time
    
    See merge request GNOME/gtk!3720

 demos/gtk-demo/paintable_mediastream.c | 12 +++++-----
 gtk/gtkmediafile.c                     |  2 +-
 gtk/gtkmediastream.c                   | 44 +++++++++++++++++-----------------
 gtk/gtkmediastream.h                   | 12 +++++-----
 modules/media/gtkffmediafile.c         | 18 +++++++-------
 modules/media/gtkgstmediafile.c        | 22 ++++++++---------
 6 files changed, 55 insertions(+), 55 deletions(-)
---