projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b868bd 4a58223)
Merge commit '4a58223e4c824fedc024af435337a769e8ce593e' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:20:10 +0000 (21:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:20:10 +0000 (21:20 +0000)
1  2 
ext/alsa/gstalsasrc.c patch | diff1 | diff2 | blob | history
gst-libs/gst/audio/gstaudiodecoder.c patch | diff1 | diff2 | blob | history
gst-libs/gst/audio/gstaudiodecoder.h patch | diff1 | diff2 | blob | history
gst-libs/gst/audio/gstaudioencoder.c patch | diff1 | diff2 | blob | history
gst-libs/gst/audio/gstaudioencoder.h patch | diff1 | diff2 | blob | history

diff --cc ext/alsa/gstalsasrc.c
Simple merge
diff --cc gst-libs/gst/audio/gstaudiodecoder.c
Simple merge
diff --cc gst-libs/gst/audio/gstaudiodecoder.h
Simple merge
diff --cc gst-libs/gst/audio/gstaudioencoder.c
Simple merge
diff --cc gst-libs/gst/audio/gstaudioencoder.h
Simple merge
Domain: Multimedia / Media Common;