projects / platform / upstream / gst-plugins-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 72f951f)
Merge remote-tracking branch 'origin/0.10'
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 6 Apr 2012 12:52:12 +0000 (14:52 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 6 Apr 2012 12:52:12 +0000 (14:52 +0200)
Conflicts:
gst/h264parse/gsth264parse.c
gst/videoparsers/gsth264parse.c


No differences found
Domain: Multimedia / Media Common;