projects / platform / upstream / gstreamer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb6e749 f914965)
Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:17:11 +0000 (15:17 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:17:11 +0000 (15:17 +0100)
commit31063f009861415c45bbaf16c5970a45cedde81b
treea1a0ef8b9428c311f6f525b438bfd209525b1a08tree | snapshot
parentfb6e749c87c96cb8ba67894b1c5540f454db9a0acommit | diff
parentf9149656e41df14362fe673b93914109ad00eb58commit | diff
Merge branch 'master' into 0.11

Conflicts:
ext/a52dec/gsta52dec.c
ext/a52dec/gsta52dec.h
ext/lame/gstlame.c
ext/lame/gstlame.h
ext/lame/gstlamemp3enc.c
ext/mad/gstmad.c
ext/mad/gstmad.h
gst/mpegaudioparse/gstmpegaudioparse.c
gst/mpegstream/gstdvddemux.c
gst/realmedia/rdtdepay.c
po/es.po
po/lv.po
po/sr.po
ext/a52dec/gsta52dec.c diff1 | diff2 | blob | history
ext/a52dec/gsta52dec.h diff1 | diff2 | blob | history
ext/dvdread/dvdreadsrc.c diff1 | diff2 | blob | history
ext/lame/Makefile.am diff1 | diff2 | blob | history
ext/lame/gstlamemp3enc.c diff1 | diff2 | blob | history
ext/mad/gstmad.c diff1 | diff2 | blob | history
gst/asfdemux/gstasfdemux.c diff1 | diff2 | blob | history
gst/realmedia/rademux.c diff1 | diff2 | blob | history
gst/realmedia/rdtmanager.c diff1 | diff2 | blob | history
gst/realmedia/rmdemux.c diff1 | diff2 | blob | history
Domain: Multimedia / Media Common;