gstreamer/ext/lame
Sebastian Dröge 31063f0098 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
2012-01-10 15:17:11 +01:00
..
gstlamemp3enc.c Merge branch 'master' into 0.11 2012-01-10 15:17:11 +01:00
gstlamemp3enc.h lamemp3enc: ensure parsed output 2011-12-26 18:28:28 +01:00
Makefile.am Merge branch 'master' into 0.11 2012-01-10 15:17:11 +01:00
plugin.c lame: remove lame element, it's been superseded by lamemp3enc 2011-10-30 13:47:26 +00:00