Hi, I have managed to merge Eric Wollesen's shout_mp3 plugin. That was quite a lot of work, because Eric changed a lot of stuff in one huge patch. I managed to separate it, and I added lots of tweaks.
At the end, I applied a patch from mantis bug 1725, which fixes a buffer overflow in the mp4 decoder plugin. We should seriously watch out for this kind of bug, I suspect we might find lots more. http://repo.or.cz/w/mpd-mk.git git://repo.or.cz/mpd-mk.git git://git.musicpd.org/cirrus/mpd.git Max Eric Wollesen (4): shout: added shout_buffer shout: send shout metadata shout: introduce pluggable encoder API shout: added mp3 encoder Max Kellermann (11): shout: no CamelCase shout: removed commented code shout: moved declarations to audioOutput_shout.h shout: moved code to audioOutput_shout_ogg.c shout: added struct _ogg_vorbis_data shout: removed typedefs on structs and plugin methods shout: static encoder plugin list shout: constant plugin declarations shout: make the shout_buffer static shout: removed clear_shout_buffer() shout: don't write empty buffers Terry (1): mp4: fix potential integer overflow bug in the mp4_decode() function configure.ac | 74 +++ doc/mpd.conf.5 | 10 doc/mpdconf.example | 1 m4/lame.m4 | 108 +++++ src/Makefile.am | 3 src/audioOutputs/audioOutput_shout.c | 596 +++++++++++-------------------- src/audioOutputs/audioOutput_shout.h | 94 ++++ src/audioOutputs/audioOutput_shout_mp3.c | 193 ++++++++++ src/audioOutputs/audioOutput_shout_ogg.c | 308 ++++++++++++++++ src/inputPlugins/mp4_plugin.c | 7 10 files changed, 1004 insertions(+), 390 deletions(-) ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team