projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19626cf 8633eb3)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 13:46:40 +0000 (15:46 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 13:46:40 +0000 (15:46 +0200)
1  2 
gst-libs/gst/audio/gstaudiodecoder.c patch | diff1 | diff2 | blob | history
gst-libs/gst/audio/gstaudioencoder.c patch | diff1 | diff2 | blob | history

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