# HG changeset patch # User rtogni # Date 1185229452 0 # Node ID e3a414ce67c8b666f98b9742f5fc3266e5bcfdda # Parent 71a72ba548d3cc40865a74192c7ada0819eb9be8 Compilation fix workaround for dca.h conflict (it exists in libavcodec and newest versions of libdca) diff -r 71a72ba548d3 -r e3a414ce67c8 libmpcodecs/Makefile --- a/libmpcodecs/Makefile Mon Jul 23 17:22:28 2007 +0000 +++ b/libmpcodecs/Makefile Mon Jul 23 22:24:12 2007 +0000 @@ -151,4 +151,4 @@ rm -f native/*.o native/*.a native/*~ -vd_mpng.o vf_screenshot.o: CFLAGS := $(filter-out -I../libavcodec,$(CFLAGS)) +ad_libdca.o vd_mpng.o vf_screenshot.o: CFLAGS := $(filter-out -I../libavcodec,$(CFLAGS))