Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 07:12:31 +0000 (09:12 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 07:12:31 +0000 (09:12 +0200)
15 files changed:
1  2 
ext/ogg/gstoggdemux.c
ext/ogg/gstoggmux.c
ext/ogg/gstoggstream.c
gst-libs/gst/pbutils/encoding-target.c
gst-libs/gst/tag/gstexiftag.c
gst-libs/gst/tag/gstxmptag.c
gst-libs/gst/tag/tag.h
gst-libs/gst/tag/tags.c
gst/encoding/gstencodebin.c
gst/tcp/gstmultifdsink.c
gst/typefind/gsttypefindfunctions.c
gst/videorate/gstvideorate.c
tests/check/libs/tag.c
tests/examples/seek/jsseek.c
tests/examples/seek/seek.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge