# HG changeset patch
# User diego
# Date 1229937638 0
# Node ID 10d81013bb5f29c9ada825c45d57c4de075fa281
# Parent  fb25bd1b00c64616f20f4fa17222a440975327ac
Sync with latest FFmpeg changes.

diff -r fb25bd1b00c6 -r 10d81013bb5f common.mak
--- a/common.mak	Mon Dec 22 09:20:18 2008 +0000
+++ b/common.mak	Mon Dec 22 09:20:38 2008 +0000
@@ -91,10 +91,10 @@
 $(SUBDIR)%-test.o: $(SUBDIR)%-test.c
 	$(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
 
-$(SUBDIR)i386/%.o: $(SUBDIR)i386/%.asm
+$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
 	$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
 
-$(SUBDIR)i386/%.d: $(SUBDIR)i386/%.asm
+$(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
 	$(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
 
 clean::
diff -r fb25bd1b00c6 -r 10d81013bb5f subdir.mak
--- a/subdir.mak	Mon Dec 22 09:20:18 2008 +0000
+++ b/subdir.mak	Mon Dec 22 09:20:38 2008 +0000
@@ -29,7 +29,7 @@
 
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
 	$(SLIB_CREATE_DEF_CMD)
-	$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS)
+	$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter-out $(DEP_LIBS),$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
 	$(SLIB_EXTRA_CMD)
 
 ifdef SUBDIR