Author: ods15 Date: Tue Nov 14 07:01:28 2006 New Revision: 202 Added: trunk/libnut/libnut.h - copied unchanged from r201, /trunk/libnut/nut.h Removed: trunk/libnut/nut.h Modified: trunk/libnut/Makefile trunk/libnut/demuxer.c trunk/libnut/muxer.c trunk/libnut/reorder.c trunk/nututils/nutmerge.h Log: rename nut.h->libnut.h Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Tue Nov 14 07:01:28 2006 @@ -6,11 +6,11 @@ install -d $(prefix)/lib install -m 644 libnut.a $(prefix)/lib install -d $(prefix)/include - install -m 644 nut.h $(prefix)/include + install -m 644 libnut.h $(prefix)/include uninstall: rm -f $(prefix)/lib/libnut.a - rm -f $(prefix)/include/nut.h + rm -f $(prefix)/include/libnut.h libnut.a: muxer.o demuxer.o reorder.o rm -f $@ Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Tue Nov 14 07:01:28 2006 @@ -4,7 +4,7 @@ #include <inttypes.h> #include <stdlib.h> #include <stdio.h> -#include "nut.h" +#include "libnut.h" #include "priv.h" static size_t stream_read(void * priv, size_t len, uint8_t * buf) { Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Tue Nov 14 07:01:28 2006 @@ -4,7 +4,7 @@ #include <inttypes.h> #include <stdlib.h> #include <stdio.h> -#include "nut.h" +#include "libnut.h" #include "priv.h" static int stream_write(void * priv, size_t len, const uint8_t * buf) { Modified: trunk/libnut/reorder.c ============================================================================== --- trunk/libnut/reorder.c (original) +++ trunk/libnut/reorder.c Tue Nov 14 07:01:28 2006 @@ -4,7 +4,7 @@ #include <inttypes.h> #include <stdlib.h> #include <stdio.h> -#include "nut.h" +#include "libnut.h" #include "priv.h" static void shift_frames(nut_context_t * nut, stream_context_t * s, int amount) { Modified: trunk/nututils/nutmerge.h ============================================================================== --- trunk/nututils/nutmerge.h (original) +++ trunk/nututils/nutmerge.h Tue Nov 14 07:01:28 2006 @@ -6,7 +6,7 @@ #include <stdio.h> //#define NDEBUG #include <assert.h> -#include <nut.h> +#include <libnut.h> #define MIN(a,b) ((a) > (b) ? (b) : (a)) #define MAX(a,b) ((a) < (b) ? (b) : (a))