• Tim-Philipp Müller's avatar
    Bump git version after unplanned 0.10.35 release · 74a75635
    Tim-Philipp Müller authored
    Merge branch '0.10.35'
    
    Conflicts:
    	configure.ac
    	docs/plugins/inspect/plugin-adder.xml
    	docs/plugins/inspect/plugin-alsa.xml
    	docs/plugins/inspect/plugin-app.xml
    	docs/plugins/inspect/plugin-audioconvert.xml
    	docs/plugins/inspect/plugin-audiorate.xml
    	docs/plugins/inspect/plugin-audioresample.xml
    	docs/plugins/inspect/plugin-audiotestsrc.xml
    	docs/plugins/inspect/plugin-cdparanoia.xml
    	docs/plugins/inspect/plugin-decodebin.xml
    	docs/plugins/inspect/plugin-encoding.xml
    	docs/plugins/inspect/plugin-ffmpegcolorspace.xml
    	docs/plugins/inspect/plugin-gdp.xml
    	docs/plugins/inspect/plugin-gio.xml
    	docs/plugins/inspect/plugin-gnomevfs.xml
    	docs/plugins/inspect/plugin-libvisual.xml
    	docs/plugins/inspect/plugin-ogg.xml
    	docs/plugins/inspect/plugin-pango.xml
    	docs/plugins/inspect/plugin-playback.xml
    	docs/plugins/inspect/plugin-subparse.xml
    	docs/plugins/inspect/plugin-tcp.xml
    	docs/plugins/inspect/plugin-theora.xml
    	docs/plugins/inspect/plugin-typefindfunctions.xml
    	docs/plugins/inspect/plugin-uridecodebin.xml
    	docs/plugins/inspect/plugin-videorate.xml
    	docs/plugins/inspect/plugin-videoscale.xml
    	docs/plugins/inspect/plugin-videotestsrc.xml
    	docs/plugins/inspect/plugin-volume.xml
    	docs/plugins/inspect/plugin-vorbis.xml
    	docs/plugins/inspect/plugin-ximagesink.xml
    	docs/plugins/inspect/plugin-xvimagesink.xml
    	gst-libs/gst/audio/Makefile.am
    	gst/subparse/gstsubparse.c
    	win32/common/_stdint.h
    	win32/common/config.h
    74a75635
plugin-ffmpegcolorspace.xml 8.67 KB