projects / platform / upstream / gst-plugins-good.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33f18b8 8191c6a)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:37:03 +0000 (16:37 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:37:03 +0000 (16:37 +0200)
Conflicts:
common

1  2 
common patch | diff1 | diff2 | blob | history
gst/rtp/gstrtpmp4gdepay.c patch | diff1 | diff2 | blob | history

diff --cc common
index 50b34ab,a39eb83..605cd9a
--- 1/common
--- 2/common
+++ b/common
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 50b34abb468b6572a92f6700552f6f541c655be8
 -Subproject commit a39eb835fb3be2a4c5a6a89b5ca5cc064e79b2e2
++Subproject commit 605cd9a65ed61505f24b840d3fe8e252be72b151
diff --cc gst/rtp/gstrtpmp4gdepay.c
Simple merge
Domain: Multimedia / Media Common;