diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-02 11:10:17 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-02 11:10:17 +0000 |
| commit | 177525f89f6a93d12c7d69a39e198e888140fb5b (patch) | |
| tree | bad83715dd58a2a318983114871915824bf8c123 /gst-plugins-base.spec.in | |
| parent | ec0d3566bf15b6daa18f0df01b044b7cecfd9e45 (diff) | |
| parent | 14644457b06f48b26f32f88ef91e1286a48ebe24 (diff) | |
| download | gstreamer-plugins-base-177525f89f6a93d12c7d69a39e198e888140fb5b.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst-libs/gst/netbuffer/gstnetbuffer.c
gst/ffmpegcolorspace/avcodec.h
gst/ffmpegcolorspace/gstffmpegcodecmap.c
gst/ffmpegcolorspace/imgconvert.c
gst/ffmpegcolorspace/imgconvert_template.h
gst/ffmpegcolorspace/mem.c
gst/playback/README
gst/playback/gstplaybasebin.c
gst/playback/gstplaybasebin.h
gst/playback/gstplaybin.c
sys/v4l/v4lmjpegsrc_calls.c
sys/v4l/videodev_mjpeg.h
tests/check/elements/gnomevfssink.c
Diffstat (limited to 'gst-plugins-base.spec.in')
0 files changed, 0 insertions, 0 deletions