summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2016-05-28 17:40:22 +0200
committerFrank Gevaerts <frank@gevaerts.be>2016-05-28 17:41:32 +0200
commitc926a5269e4af6119d54711becc72d7e94d9d5a9 (patch)
treeb855507fc98cd1ef960adb274fb144dd321e3321
parentcdca7cee7112d6625bbb9884cc90886571769061 (diff)
downloadrockbox-c926a52.tar.gz
rockbox-c926a52.zip
Fix race conditions in parallel build.
ffmpeg_bitstream.c is included in libcodec, so there doesn't seem to be any reason for individual codecs to also compile it (and clobber any previous copy while they're at it, leading to broken builds) Change-Id: I2bedc277ab109f44a6e8feb3d12ed01a720e00a6
-rw-r--r--lib/rbcodec/codecs/libwma/SOURCES1
-rw-r--r--lib/rbcodec/codecs/libwmapro/SOURCES1
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/rbcodec/codecs/libwma/SOURCES b/lib/rbcodec/codecs/libwma/SOURCES
index 14cf0c8922..280dfe6c82 100644
--- a/lib/rbcodec/codecs/libwma/SOURCES
+++ b/lib/rbcodec/codecs/libwma/SOURCES
@@ -1,3 +1,2 @@
wmadeci.c
wmafixed.c
-../lib/ffmpeg_bitstream.c
diff --git a/lib/rbcodec/codecs/libwmapro/SOURCES b/lib/rbcodec/codecs/libwmapro/SOURCES
index 296f26ab7f..ca711641e8 100644
--- a/lib/rbcodec/codecs/libwmapro/SOURCES
+++ b/lib/rbcodec/codecs/libwmapro/SOURCES
@@ -1,4 +1,3 @@
wmaprodec.c
wma.c
mdct_tables.c
-../lib/ffmpeg_bitstream.c