diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-17 14:26:36 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-17 14:26:36 +0000 |
| commit | bacac99192b65faed1a0047a8be5b95abf15873d (patch) | |
| tree | c1ca0949f9cb222c8ef6305d8150ca4d9e85b4a7 /src/dxr3 | |
| parent | 75a1024fb27dbff9c4bfc948392910af94797683 (diff) | |
| download | xine-lib-bacac99192b65faed1a0047a8be5b95abf15873d.tar.gz xine-lib-bacac99192b65faed1a0047a8be5b95abf15873d.tar.bz2 | |
Add 'xine_' prefix to all of xine-utils functions (what about cpu
acceleration?). Merge xine-utils header files to a new one "xineutils.h".
Update xine-lib C/headers to reflect those changes.
dxr3 headers are no more installed ine $includdir, but $includdir/xine.
CVS patchset: 1054
CVS date: 2001/11/17 14:26:36
Diffstat (limited to 'src/dxr3')
| -rw-r--r-- | src/dxr3/Makefile.am | 23 | ||||
| -rw-r--r-- | src/dxr3/dxr3_video_out.h | 4 | ||||
| -rw-r--r-- | src/dxr3/dxr3_vo_encoder.c | 4 |
3 files changed, 27 insertions, 4 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 8c09a7762..8bbd53657 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -33,6 +33,29 @@ debug: install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +### +# Install header files (default=$includedir/xine) +# +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir)/xine + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ + done + + +### +# Remove them +# +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + list='$(include_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(includedir)/xine/$$p; \ + done + + mostlyclean-generic: -rm -f *~ \#* .*~ .\#* diff --git a/src/dxr3/dxr3_video_out.h b/src/dxr3/dxr3_video_out.h index 74874d9ac..0a6d65c59 100644 --- a/src/dxr3/dxr3_video_out.h +++ b/src/dxr3/dxr3_video_out.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_video_out.h,v 1.3 2001/11/08 08:49:26 mlampard Exp $ + * $Id: dxr3_video_out.h,v 1.4 2001/11/17 14:26:38 f1rmb Exp $ * */ @@ -41,7 +41,7 @@ #include "xine_internal.h" /* for fast_memcpy: */ -#include "memcpy.h" +#include "xineutils.h" #include <X11/Xlib.h> #include <X11/Xatom.h> diff --git a/src/dxr3/dxr3_vo_encoder.c b/src/dxr3/dxr3_vo_encoder.c index 42c57dfcd..0e1570f63 100644 --- a/src/dxr3/dxr3_vo_encoder.c +++ b/src/dxr3/dxr3_vo_encoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_vo_encoder.c,v 1.2 2001/11/12 23:56:31 hrm Exp $ + * $Id: dxr3_vo_encoder.c,v 1.3 2001/11/17 14:26:38 f1rmb Exp $ * * mpeg1 encoding video out plugin for the dxr3. * @@ -445,7 +445,7 @@ static void dxr3_frame_copy(vo_frame_t *frame_gen, uint8_t **src) } # if USE_MPEG_BUFFER /* copy mpeg data to frame */ - fast_memcpy(frame->mpeg, buffer, size); + xine_fast_memcpy(frame->mpeg, buffer, size); frame->mpeg_size = size; # endif #endif |