projects / platform / upstream / gst-plugins-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd54722 d6b60c6)
Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:50:37 +0000 (15:50 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:50:37 +0000 (15:50 +0100)
Conflicts:
gst/mpegtsdemux/tsdemux.c
gst/videoparsers/gsth264parse.c
tests/check/elements/camerabin2.c

1  2 
ext/opus/gstopusenc.c patch | diff1 | diff2 | blob | history

diff --cc ext/opus/gstopusenc.c
Simple merge
Domain: Multimedia / Media Common;