Skip to content
Snippets Groups Projects
Commit 17bfba09 authored by Edward Hervey's avatar Edward Hervey :metal:
Browse files

Merge branch 'master' into 0.11

Conflicts:
	ext/ogg/gstoggdemux.c
	ext/pango/gsttextoverlay.c
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/audio/gstbaseaudiosrc.c
	gst/playback/gstsubtitleoverlay.c
	gst/videorate/gstvideorate.c
parents 3f45eb1c 001b4a00
No related branches found
No related tags found
No related merge requests found
Showing
with 1326 additions and 233 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment