projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90ec31f 894760b)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:23:56 +0000 (19:23 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:23:56 +0000 (19:23 +0200)
Conflicts:
android/amrnb.mk
android/amrwbdec.mk
android/asf.mk
android/mpegaudioparse.mk
configure.ac

1  2 
configure.ac patch | diff1 | diff2 | blob | history
gst/asfdemux/gstasfdemux.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc gst/asfdemux/gstasfdemux.c
Simple merge
Domain: Multimedia / Media Common;