diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libffmpeg/libavcodec/Makefile.am | 2 | ||||
-rw-r--r-- | src/libffmpeg/libavcodec/armv4l/Makefile.am | 10 | ||||
-rw-r--r-- | src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l_dummy.c | 2 | ||||
-rw-r--r-- | src/libffmpeg/libavcodec/i386/Makefile.am | 9 | ||||
-rw-r--r-- | src/libffmpeg/libavcodec/i386/libavcodec_mmx_dummy.c | 2 | ||||
-rw-r--r-- | src/libffmpeg/libavcodec/mlib/Makefile.am | 9 | ||||
-rw-r--r-- | src/libffmpeg/libavcodec/mlib/libavcodec_mlib_dummy.c | 2 |
7 files changed, 25 insertions, 11 deletions
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index 8e2a6a4df..bd959ab40 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -18,7 +18,7 @@ libavcodec_la_SOURCES = common.c utils.c mpegvideo.c h263.c jrevdct.c jfdctfst.c motion_est.c imgconvert.c msmpeg4.c \ mpeg12.c h263dec.c rv10.c simple_idct.c #imgresample.c - + libavcodec_la_LDFLAGS = \ $(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \ $(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \ diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am index 49512fa17..1059cb1ce 100644 --- a/src/libffmpeg/libavcodec/armv4l/Makefile.am +++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am @@ -11,14 +11,16 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic noinst_LTLIBRARIES = libavcodec_armv4l.la -EXTRA_DIST = jrevdct_arm.S dsputil_arm.c +libavcodec_armv4l_src = jrevdct_arm.S dsputil_arm.c +libavcodec_armv4l_dummy = libavcodec_armv4l_dummy.c +EXTRA_DIST = $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy) #if HAVE_ARMV4L -#armv4l_modules = $(EXTRA_DIST) +#armv4l_modules = $(libavcodec_armv4l_src) #endif -armv4l_modules = +armv4l_modules = -libavcodec_armv4l_la_SOURCES = $(armv4l_modules) +libavcodec_armv4l_la_SOURCES = $(armv4l_modules) $(libavcodec_armv4l_dummy) noinst_HEADERS = diff --git a/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l_dummy.c b/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l_dummy.c new file mode 100644 index 000000000..ebe4c235c --- /dev/null +++ b/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l_dummy.c @@ -0,0 +1,2 @@ + +char libavcodec_armv4l_dummy; diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am index 1620b967a..3e5187a27 100644 --- a/src/libffmpeg/libavcodec/i386/Makefile.am +++ b/src/libffmpeg/libavcodec/i386/Makefile.am @@ -14,17 +14,20 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic noinst_LTLIBRARIES = libavcodec_mmx.la -EXTRA_DIST = fdct_mmx.c \ +libavcodec_mmx_src = fdct_mmx.c \ dsputil_mmx.c mpegvideo_mmx.c \ idct_mmx.c motion_est_mmx.c \ simple_idct_mmx.c +libavcodec_mmx_dummy = libavcodec_mmx_dummy.c + +EXTRA_DIST = $(libavcodec_mmx_src) $(libavcodec_mmx_dummy) if HAVE_FFMMX -mmx_modules = $(EXTRA_DIST) +mmx_modules = $(libavcodec_mmx_src) endif -libavcodec_mmx_la_SOURCES = $(mmx_modules) +libavcodec_mmx_la_SOURCES = $(mmx_modules) $(libavcodec_mmx_dummy) noinst_HEADERS = dsputil_mmx_avg.h mmx.h diff --git a/src/libffmpeg/libavcodec/i386/libavcodec_mmx_dummy.c b/src/libffmpeg/libavcodec/i386/libavcodec_mmx_dummy.c new file mode 100644 index 000000000..04a6fc298 --- /dev/null +++ b/src/libffmpeg/libavcodec/i386/libavcodec_mmx_dummy.c @@ -0,0 +1,2 @@ + +char libavcodec_mmx_dummy; diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am index 92dc8cc30..9ee002c7b 100644 --- a/src/libffmpeg/libavcodec/mlib/Makefile.am +++ b/src/libffmpeg/libavcodec/mlib/Makefile.am @@ -11,13 +11,16 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic noinst_LTLIBRARIES = libavcodec_mlib.la -EXTRA_DIST = dsputil_mlib.c +libavcodec_mlib_src = dsputil_mlib.c +libavcodec_mlib_dummy = libavcodec_mlib_dummy.c + +EXTRA_DIST = $(libavcodec_mlib_src) $(libavcodec_mlib_dummy) if HAVE_MLIB -mlib_modules = $(EXTRA_DIST) +mlib_modules = $(libavcodec_mlib_src) endif -libavcodec_mlib_la_SOURCES = $(mlib_modules) +libavcodec_mlib_la_SOURCES = $(mlib_modules) $(libavcodec_mlib_dummy) noinst_HEADERS = diff --git a/src/libffmpeg/libavcodec/mlib/libavcodec_mlib_dummy.c b/src/libffmpeg/libavcodec/mlib/libavcodec_mlib_dummy.c new file mode 100644 index 000000000..a09ee4e28 --- /dev/null +++ b/src/libffmpeg/libavcodec/mlib/libavcodec_mlib_dummy.c @@ -0,0 +1,2 @@ + +char libavcodec_mlib_dummy; |