projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0af3275 9175a90)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 8 Jun 2011 16:06:56 +0000 (18:06 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 8 Jun 2011 16:06:56 +0000 (18:06 +0200)
1  2 
gst/matroska/matroska-demux.c patch | diff1 | diff2 | blob | history
gst/rtsp/gstrtspsrc.c patch | diff1 | diff2 | blob | history

diff --cc gst/matroska/matroska-demux.c
Simple merge
diff --cc gst/rtsp/gstrtspsrc.c
Simple merge
Domain: Multimedia / Media Common;