• Wim Taymans's avatar
    Merge branch 'master' into 0.11 · c44cd8f5
    Wim Taymans authored
    unport gdkpixbuf
    not merged: https://bugzilla.gnome.org/show_bug.cgi?id=654850
    
    Conflicts:
    	docs/plugins/Makefile.am
    	docs/plugins/gst-plugins-good-plugins-docs.sgml
    	docs/plugins/gst-plugins-good-plugins-sections.txt
    	docs/plugins/gst-plugins-good-plugins.hierarchy
    	docs/plugins/inspect/plugin-avi.xml
    	docs/plugins/inspect/plugin-png.xml
    	ext/flac/gstflacdec.c
    	ext/flac/gstflacdec.h
    	ext/libpng/gstpngdec.c
    	ext/libpng/gstpngenc.c
    	ext/speex/gstspeexdec.c
    	gst/audioparsers/gstflacparse.c
    	gst/flv/gstflvmux.c
    	gst/rtp/gstrtpdvdepay.c
    	gst/rtp/gstrtph264depay.c
    c44cd8f5
plugin-gdkpixbuf.xml 10.1 KB