Upstream version 1.4.0

Upstream version 1.3.91

Upstream version 1.3.90

Upstream version 1.3.3

Upstream version 1.3.2

Upstream version 1.3.1

Upstream version 1.2.4

Upstream version 1.2.3

Upstream version 1.2.2

Upstream version 1.2.1

Upstream version 1.2.0

Conflicts:
	ChangeLog
	NEWS
	RELEASE
	configure
	configure.ac
	docs/plugins/html/gst-plugins-good-plugins-1.0.devhelp2
	docs/plugins/html/gst-plugins-good-plugins-monoscope.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-1394.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-aasink.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-alaw.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-alpha.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-alphacolor.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-apetag.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-audiofx.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-auparse.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-autodetect.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-avi.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-cacasink.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-cairo.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-cutter.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-debug.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-deinterlace.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-dv.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-effectv.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-equalizer.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-flac.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-flv.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-flxdec.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-gdkpixbuf.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-goom.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-goom2k1.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-icydemux.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-id3demux.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-imagefreeze.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-interleave.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-isomp4.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-jack.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-jpeg.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-level.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-matroska.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-mulaw.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-multifile.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-multipart.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-navigationtest.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-oss4.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-ossaudio.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-png.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-pulseaudio.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-replaygain.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-rtp.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-rtpmanager.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-rtsp.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-shapewipe.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-shout2send.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-smpte.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-soup.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-spectrum.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-speex.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-taglib.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-udp.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-video4linux2.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-videobox.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-videocrop.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-videofilter.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-videomixer.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-vpx.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-wavenc.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-wavpack.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-wavparse.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-ximagesrc.html
	docs/plugins/html/gst-plugins-good-plugins-plugin-y4menc.html
	docs/plugins/html/gst-plugins-good-plugins-rtpjitterbuffer.html
	docs/plugins/html/gst-plugins-good-plugins-rtpptdemux.html
	docs/plugins/html/gst-plugins-good-plugins-rtpsession.html
	docs/plugins/html/gst-plugins-good-plugins-rtpssrcdemux.html
	docs/plugins/html/index.html
	docs/plugins/inspect/plugin-1394.xml
	docs/plugins/inspect/plugin-aasink.xml
	docs/plugins/inspect/plugin-alaw.xml
	docs/plugins/inspect/plugin-alpha.xml
	docs/plugins/inspect/plugin-alphacolor.xml
	docs/plugins/inspect/plugin-apetag.xml
	docs/plugins/inspect/plugin-audiofx.xml
	docs/plugins/inspect/plugin-audioparsers.xml
	docs/plugins/inspect/plugin-auparse.xml
	docs/plugins/inspect/plugin-autodetect.xml
	docs/plugins/inspect/plugin-avi.xml
	docs/plugins/inspect/plugin-cacasink.xml
	docs/plugins/inspect/plugin-cairo.xml
	docs/plugins/inspect/plugin-cutter.xml
	docs/plugins/inspect/plugin-debug.xml
	docs/plugins/inspect/plugin-deinterlace.xml
	docs/plugins/inspect/plugin-dv.xml
	docs/plugins/inspect/plugin-effectv.xml
	docs/plugins/inspect/plugin-equalizer.xml
	docs/plugins/inspect/plugin-flac.xml
	docs/plugins/inspect/plugin-flv.xml
	docs/plugins/inspect/plugin-flxdec.xml
	docs/plugins/inspect/plugin-gdkpixbuf.xml
	docs/plugins/inspect/plugin-goom.xml
	docs/plugins/inspect/plugin-goom2k1.xml
	docs/plugins/inspect/plugin-icydemux.xml
	docs/plugins/inspect/plugin-id3demux.xml
	docs/plugins/inspect/plugin-imagefreeze.xml
	docs/plugins/inspect/plugin-interleave.xml
	docs/plugins/inspect/plugin-isomp4.xml
	docs/plugins/inspect/plugin-jack.xml
	docs/plugins/inspect/plugin-jpeg.xml
	docs/plugins/inspect/plugin-level.xml
	docs/plugins/inspect/plugin-matroska.xml
	docs/plugins/inspect/plugin-mulaw.xml
	docs/plugins/inspect/plugin-multifile.xml
	docs/plugins/inspect/plugin-multipart.xml
	docs/plugins/inspect/plugin-navigationtest.xml
	docs/plugins/inspect/plugin-oss4.xml
	docs/plugins/inspect/plugin-ossaudio.xml
	docs/plugins/inspect/plugin-png.xml
	docs/plugins/inspect/plugin-pulseaudio.xml
	docs/plugins/inspect/plugin-replaygain.xml
	docs/plugins/inspect/plugin-rtp.xml
	docs/plugins/inspect/plugin-rtpmanager.xml
	docs/plugins/inspect/plugin-rtsp.xml
	docs/plugins/inspect/plugin-shapewipe.xml
	docs/plugins/inspect/plugin-shout2send.xml
	docs/plugins/inspect/plugin-smpte.xml
	docs/plugins/inspect/plugin-soup.xml
	docs/plugins/inspect/plugin-spectrum.xml
	docs/plugins/inspect/plugin-speex.xml
	docs/plugins/inspect/plugin-taglib.xml
	docs/plugins/inspect/plugin-udp.xml
	docs/plugins/inspect/plugin-video4linux2.xml
	docs/plugins/inspect/plugin-videobox.xml
	docs/plugins/inspect/plugin-videocrop.xml
	docs/plugins/inspect/plugin-videofilter.xml
	docs/plugins/inspect/plugin-videomixer.xml
	docs/plugins/inspect/plugin-vpx.xml
	docs/plugins/inspect/plugin-wavenc.xml
	docs/plugins/inspect/plugin-wavpack.xml
	docs/plugins/inspect/plugin-wavparse.xml
	docs/plugins/inspect/plugin-ximagesrc.xml
	docs/plugins/inspect/plugin-y4menc.xml
	gst-plugins-good.doap
	gst-plugins-good.spec
	po/af.gmo
	po/af.po
	po/az.gmo
	po/az.po
	po/bg.gmo
	po/bg.po
	po/ca.gmo
	po/ca.po
	po/cs.gmo
	po/cs.po
	po/da.gmo
	po/da.po
	po/de.gmo
	po/de.po
	po/el.gmo
	po/el.po
	po/en_GB.gmo
	po/en_GB.po
	po/eo.gmo
	po/eo.po
	po/es.gmo
	po/es.po
	po/eu.gmo
	po/eu.po
	po/fi.gmo
	po/fi.po
	po/fr.gmo
	po/fr.po
	po/gl.gmo
	po/gl.po
	po/gst-plugins-good-1.0.pot
	po/hr.gmo
	po/hr.po
	po/hu.gmo
	po/hu.po
	po/id.gmo
	po/id.po
	po/it.gmo
	po/it.po
	po/ja.gmo
	po/ja.po
	po/lt.gmo
	po/lt.po
	po/lv.gmo
	po/lv.po
	po/mt.gmo
	po/mt.po
	po/nb.gmo
	po/nb.po
	po/nl.gmo
	po/nl.po
	po/or.gmo
	po/or.po
	po/pl.gmo
	po/pl.po
	po/pt_BR.gmo
	po/pt_BR.po
	po/ro.gmo
	po/ro.po
	po/ru.gmo
	po/ru.po
	po/sk.gmo
	po/sk.po
	po/sl.gmo
	po/sl.po
	po/sq.gmo
	po/sq.po
	po/sr.gmo
	po/sr.po
	po/sv.gmo
	po/sv.po
	po/tr.gmo
	po/tr.po
	po/uk.gmo
	po/uk.po
	po/vi.gmo
	po/vi.po
	po/zh_CN.gmo
	po/zh_CN.po
	po/zh_HK.gmo
	po/zh_HK.po
	po/zh_TW.gmo
	po/zh_TW.po
	win32/common/config.h

Conflicts:
	docs/plugins/html/gst-plugins-good-plugins-gdkpixbufoverlay.html