summaryrefslogtreecommitdiffstats
path: root/lib/rbcodec/codecs/codecs.make
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2013-05-18 19:48:08 +0200
committerNils Wallménius <nils@rockbox.org>2013-05-18 23:38:23 +0200
commitc7124b552044ef92a128481d32df081d1210cbe1 (patch)
tree4e596edb09396ef96ab93d064fddcae179d51ef7 /lib/rbcodec/codecs/codecs.make
parentfc0cf8d91b1710d7843981d56ef2ac9a6dfeb294 (diff)
downloadrockbox-c7124b552044ef92a128481d32df081d1210cbe1.tar.gz
rockbox-c7124b552044ef92a128481d32df081d1210cbe1.tar.bz2
rockbox-c7124b552044ef92a128481d32df081d1210cbe1.zip
Fix opus craches with large embedded album art
Use the tlsf malloc and friends instead of the silly codec_malloc to get actually working free and saner realloc that doesn't leak memory. Makes files with moderately sized embedded AA play on targets with large enough codec buffers and files with too large AA are now skipped rather than crashing. Fixes crash when playing example file in FS#12842. Change-Id: I06562955c4d9a95bd90f55738214fba462092b71
Diffstat (limited to 'lib/rbcodec/codecs/codecs.make')
-rw-r--r--lib/rbcodec/codecs/codecs.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index 21bb9332b3..08554d9628 100644
--- a/lib/rbcodec/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -172,7 +172,7 @@ $(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a $(CODECDIR)/libemu2413.a
$(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a
$(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a
$(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a
-$(CODECDIR)/opus.codec : $(CODECDIR)/libopus.a
+$(CODECDIR)/opus.codec : $(CODECDIR)/libopus.a $(TLSFLIB)
$(CODECS): $(CODEC_LIBS) # this must be last in codec dependency list