diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-12 14:24:37 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-12 14:24:37 -0400 |
| commit | 2bc0d4f2ce89e73aaa9c9b8c4b41a22b1b95052b (patch) | |
| tree | b5c9d71713b456d6c3d0b2eb5fabd7e0afd5b308 /src | |
| parent | aa6b402b7a240b6f55c063b021c5c211f46ec8bd (diff) | |
| parent | be3a453c296d3999f1a93ba26b43b995eeb41a2f (diff) | |
| download | xine-lib-2bc0d4f2ce89e73aaa9c9b8c4b41a22b1b95052b.tar.gz xine-lib-2bc0d4f2ce89e73aaa9c9b8c4b41a22b1b95052b.tar.bz2 | |
Merge changes from main 1.2 repository
Diffstat (limited to 'src')
| -rw-r--r-- | src/post/planar/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 44f09c6b6..a4e8cb825 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -15,10 +15,9 @@ postproc_lib = $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a \ $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a: - $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a - + $(MAKE) -C $(top_builddir)/contrib ffmpeg/libpostproc/libpostproc.a $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a: - $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a + $(MAKE) -C $(top_builddir)/contrib ffmpeg/libavutil/libavutil.a endif # Avoid errors with -O0 |