diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | libavformat/.cvsignore (renamed from libav/.cvsignore) | 0 | ||||
| -rw-r--r-- | libavformat/Makefile (renamed from libav/Makefile) | 0 | ||||
| -rw-r--r-- | libavformat/allformats.c (renamed from libav/allformats.c) | 0 | ||||
| -rw-r--r-- | libavformat/asf.c (renamed from libav/asf.c) | 0 | ||||
| -rw-r--r-- | libavformat/au.c (renamed from libav/au.c) | 0 | ||||
| -rw-r--r-- | libavformat/audio.c (renamed from libav/audio.c) | 0 | ||||
| -rw-r--r-- | libavformat/avformat.h (renamed from libav/avformat.h) | 0 | ||||
| -rw-r--r-- | libavformat/avi.h (renamed from libav/avi.h) | 0 | ||||
| -rw-r--r-- | libavformat/avidec.c (renamed from libav/avidec.c) | 0 | ||||
| -rw-r--r-- | libavformat/avienc.c (renamed from libav/avienc.c) | 0 | ||||
| -rw-r--r-- | libavformat/avio.c (renamed from libav/avio.c) | 0 | ||||
| -rw-r--r-- | libavformat/avio.h (renamed from libav/avio.h) | 0 | ||||
| -rw-r--r-- | libavformat/aviobuf.c (renamed from libav/aviobuf.c) | 0 | ||||
| -rw-r--r-- | libavformat/barpainet.c (renamed from libav/barpainet.c) | 0 | ||||
| -rw-r--r-- | libavformat/barpainet.h (renamed from libav/barpainet.h) | 0 | ||||
| -rw-r--r-- | libavformat/beosaudio.cpp (renamed from libav/beosaudio.cpp) | 0 | ||||
| -rw-r--r-- | libavformat/crc.c (renamed from libav/crc.c) | 0 | ||||
| -rw-r--r-- | libavformat/cutils.c (renamed from libav/cutils.c) | 0 | ||||
| -rw-r--r-- | libavformat/dv.c (renamed from libav/dv.c) | 0 | ||||
| -rw-r--r-- | libavformat/ffm.c (renamed from libav/ffm.c) | 0 | ||||
| -rw-r--r-- | libavformat/file.c (renamed from libav/file.c) | 0 | ||||
| -rw-r--r-- | libavformat/framehook.c (renamed from libav/framehook.c) | 0 | ||||
| -rw-r--r-- | libavformat/framehook.h (renamed from libav/framehook.h) | 0 | ||||
| -rw-r--r-- | libavformat/gif.c (renamed from libav/gif.c) | 0 | ||||
| -rw-r--r-- | libavformat/grab.c (renamed from libav/grab.c) | 0 | ||||
| -rw-r--r-- | libavformat/http.c (renamed from libav/http.c) | 0 | ||||
| -rw-r--r-- | libavformat/img.c (renamed from libav/img.c) | 0 | ||||
| -rw-r--r-- | libavformat/jpeg.c (renamed from libav/jpeg.c) | 0 | ||||
| -rw-r--r-- | libavformat/mov.c (renamed from libav/mov.c) | 0 | ||||
| -rw-r--r-- | libavformat/mpeg.c (renamed from libav/mpeg.c) | 0 | ||||
| -rw-r--r-- | libavformat/mpegts.c (renamed from libav/mpegts.c) | 0 | ||||
| -rw-r--r-- | libavformat/ogg.c (renamed from libav/ogg.c) | 0 | ||||
| -rw-r--r-- | libavformat/raw.c (renamed from libav/raw.c) | 0 | ||||
| -rw-r--r-- | libavformat/rm.c (renamed from libav/rm.c) | 0 | ||||
| -rw-r--r-- | libavformat/rtp.c (renamed from libav/rtp.c) | 0 | ||||
| -rw-r--r-- | libavformat/rtp.h (renamed from libav/rtp.h) | 0 | ||||
| -rw-r--r-- | libavformat/rtpproto.c (renamed from libav/rtpproto.c) | 0 | ||||
| -rw-r--r-- | libavformat/rtsp.c (renamed from libav/rtsp.c) | 0 | ||||
| -rw-r--r-- | libavformat/rtsp.h (renamed from libav/rtsp.h) | 0 | ||||
| -rw-r--r-- | libavformat/rtspcodes.h (renamed from libav/rtspcodes.h) | 0 | ||||
| -rw-r--r-- | libavformat/strptime.c (renamed from libav/strptime.c) | 0 | ||||
| -rw-r--r-- | libavformat/strptime.h (renamed from libav/strptime.h) | 0 | ||||
| -rw-r--r-- | libavformat/swf.c (renamed from libav/swf.c) | 0 | ||||
| -rw-r--r-- | libavformat/tcp.c (renamed from libav/tcp.c) | 0 | ||||
| -rw-r--r-- | libavformat/udp.c (renamed from libav/udp.c) | 0 | ||||
| -rw-r--r-- | libavformat/utils.c (renamed from libav/utils.c) | 0 | ||||
| -rw-r--r-- | libavformat/wav.c (renamed from libav/wav.c) | 0 | ||||
| -rw-r--r-- | vhook/Makefile | 2 |
49 files changed, 10 insertions, 10 deletions
@@ -6,7 +6,7 @@ include config.mak VPATH=$(SRC_PATH) -CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE +CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ifeq ($(CONFIG_DARWIN),yes) LDFLAGS+= -g -d FFSLDFLAGS= -Wl,-bind_at_load @@ -33,9 +33,9 @@ EXTRALIBS+=-lmedia -lbe endif ifeq ($(BUILD_SHARED),yes) -DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a +DEP_LIBS=libavcodec/libavcodec.so libavformat/libavformat.a else -DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a +DEP_LIBS=libavcodec/libavcodec.a libavformat/libavformat.a ifeq ($(CONFIG_MP3LAME),yes) EXTRALIBS+=-lmp3lame endif @@ -60,10 +60,10 @@ all: lib $(PROG) $(VHOOK) lib: $(MAKE) -C libavcodec all - $(MAKE) -C libav all + $(MAKE) -C libavformat all ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS) - $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libav \ + $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \ -lavformat -lavcodec $(EXTRALIBS) ffmpeg$(EXE): ffmpeg_g$(EXE) @@ -71,7 +71,7 @@ ffmpeg$(EXE): ffmpeg_g$(EXE) ffserver$(EXE): ffserver.o $(DEP_LIBS) $(CC) $(LDFLAGS) $(FFSLDFLAGS) \ - -o $@ ffserver.o -L./libavcodec -L./libav \ + -o $@ ffserver.o -L./libavcodec -L./libavformat \ -lavformat -lavcodec -ldl $(EXTRALIBS) ffplay: ffmpeg$(EXE) @@ -97,7 +97,7 @@ $(prefix)/lib/vhook: installlib: $(MAKE) -C libavcodec installlib - $(MAKE) -C libav installlib + $(MAKE) -C libavformat installlib dep: depend @@ -106,7 +106,7 @@ depend: clean: $(CLEANVHOOK) $(MAKE) -C libavcodec clean - $(MAKE) -C libav clean + $(MAKE) -C libavformat clean $(MAKE) -C tests clean rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) @@ -118,7 +118,7 @@ distclean: clean rm -f config.mak config.h TAGS: - etags *.[ch] libav/*.[ch] libavcodec/*.[ch] + etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch] # regression tests diff --git a/libav/.cvsignore b/libavformat/.cvsignore index 0cc425c..0cc425c 100644 --- a/libav/.cvsignore +++ b/libavformat/.cvsignore diff --git a/libav/Makefile b/libavformat/Makefile index 1051aa6..1051aa6 100644 --- a/libav/Makefile +++ b/libavformat/Makefile diff --git a/libav/allformats.c b/libavformat/allformats.c index 8a65638..8a65638 100644 --- a/libav/allformats.c +++ b/libavformat/allformats.c diff --git a/libav/asf.c b/libavformat/asf.c index 2f1ce12..2f1ce12 100644 --- a/libav/asf.c +++ b/libavformat/asf.c diff --git a/libav/au.c b/libavformat/au.c index 8c3d62a..8c3d62a 100644 --- a/libav/au.c +++ b/libavformat/au.c diff --git a/libav/audio.c b/libavformat/audio.c index 4fa155c..4fa155c 100644 --- a/libav/audio.c +++ b/libavformat/audio.c diff --git a/libav/avformat.h b/libavformat/avformat.h index 0ea10f7..0ea10f7 100644 --- a/libav/avformat.h +++ b/libavformat/avformat.h diff --git a/libav/avi.h b/libavformat/avi.h index d1b5eb5..d1b5eb5 100644 --- a/libav/avi.h +++ b/libavformat/avi.h diff --git a/libav/avidec.c b/libavformat/avidec.c index 9646408..9646408 100644 --- a/libav/avidec.c +++ b/libavformat/avidec.c diff --git a/libav/avienc.c b/libavformat/avienc.c index b4298b0..b4298b0 100644 --- a/libav/avienc.c +++ b/libavformat/avienc.c diff --git a/libav/avio.c b/libavformat/avio.c index 37af56f..37af56f 100644 --- a/libav/avio.c +++ b/libavformat/avio.c diff --git a/libav/avio.h b/libavformat/avio.h index 541eff5..541eff5 100644 --- a/libav/avio.h +++ b/libavformat/avio.h diff --git a/libav/aviobuf.c b/libavformat/aviobuf.c index 2e931bd..2e931bd 100644 --- a/libav/aviobuf.c +++ b/libavformat/aviobuf.c diff --git a/libav/barpainet.c b/libavformat/barpainet.c index c1e8877..c1e8877 100644 --- a/libav/barpainet.c +++ b/libavformat/barpainet.c diff --git a/libav/barpainet.h b/libavformat/barpainet.h index 461403b..461403b 100644 --- a/libav/barpainet.h +++ b/libavformat/barpainet.h diff --git a/libav/beosaudio.cpp b/libavformat/beosaudio.cpp index a1ae0a5..a1ae0a5 100644 --- a/libav/beosaudio.cpp +++ b/libavformat/beosaudio.cpp diff --git a/libav/crc.c b/libavformat/crc.c index 553ab53..553ab53 100644 --- a/libav/crc.c +++ b/libavformat/crc.c diff --git a/libav/cutils.c b/libavformat/cutils.c index ce2c845..ce2c845 100644 --- a/libav/cutils.c +++ b/libavformat/cutils.c diff --git a/libav/dv.c b/libavformat/dv.c index 1f152a2..1f152a2 100644 --- a/libav/dv.c +++ b/libavformat/dv.c diff --git a/libav/ffm.c b/libavformat/ffm.c index c21599c..c21599c 100644 --- a/libav/ffm.c +++ b/libavformat/ffm.c diff --git a/libav/file.c b/libavformat/file.c index 8206ff9..8206ff9 100644 --- a/libav/file.c +++ b/libavformat/file.c diff --git a/libav/framehook.c b/libavformat/framehook.c index 03ee32e..03ee32e 100644 --- a/libav/framehook.c +++ b/libavformat/framehook.c diff --git a/libav/framehook.h b/libavformat/framehook.h index eb1a51f..eb1a51f 100644 --- a/libav/framehook.h +++ b/libavformat/framehook.h diff --git a/libav/gif.c b/libavformat/gif.c index 6becf52..6becf52 100644 --- a/libav/gif.c +++ b/libavformat/gif.c diff --git a/libav/grab.c b/libavformat/grab.c index 8173bac..8173bac 100644 --- a/libav/grab.c +++ b/libavformat/grab.c diff --git a/libav/http.c b/libavformat/http.c index 7271a6d..7271a6d 100644 --- a/libav/http.c +++ b/libavformat/http.c diff --git a/libav/img.c b/libavformat/img.c index 305cbb0..305cbb0 100644 --- a/libav/img.c +++ b/libavformat/img.c diff --git a/libav/jpeg.c b/libavformat/jpeg.c index 6a19db6..6a19db6 100644 --- a/libav/jpeg.c +++ b/libavformat/jpeg.c diff --git a/libav/mov.c b/libavformat/mov.c index 91c7155..91c7155 100644 --- a/libav/mov.c +++ b/libavformat/mov.c diff --git a/libav/mpeg.c b/libavformat/mpeg.c index 7488418..7488418 100644 --- a/libav/mpeg.c +++ b/libavformat/mpeg.c diff --git a/libav/mpegts.c b/libavformat/mpegts.c index 2947d96..2947d96 100644 --- a/libav/mpegts.c +++ b/libavformat/mpegts.c diff --git a/libav/ogg.c b/libavformat/ogg.c index 7c7c96c..7c7c96c 100644 --- a/libav/ogg.c +++ b/libavformat/ogg.c diff --git a/libav/raw.c b/libavformat/raw.c index 518206e..518206e 100644 --- a/libav/raw.c +++ b/libavformat/raw.c diff --git a/libav/rm.c b/libavformat/rm.c index be90a27..be90a27 100644 --- a/libav/rm.c +++ b/libavformat/rm.c diff --git a/libav/rtp.c b/libavformat/rtp.c index f36da6d..f36da6d 100644 --- a/libav/rtp.c +++ b/libavformat/rtp.c diff --git a/libav/rtp.h b/libavformat/rtp.h index 0c0ae35..0c0ae35 100644 --- a/libav/rtp.h +++ b/libavformat/rtp.h diff --git a/libav/rtpproto.c b/libavformat/rtpproto.c index 41823fc..41823fc 100644 --- a/libav/rtpproto.c +++ b/libavformat/rtpproto.c diff --git a/libav/rtsp.c b/libavformat/rtsp.c index c173cb8..c173cb8 100644 --- a/libav/rtsp.c +++ b/libavformat/rtsp.c diff --git a/libav/rtsp.h b/libavformat/rtsp.h index 3dd2315..3dd2315 100644 --- a/libav/rtsp.h +++ b/libavformat/rtsp.h diff --git a/libav/rtspcodes.h b/libavformat/rtspcodes.h index b967cb9..b967cb9 100644 --- a/libav/rtspcodes.h +++ b/libavformat/rtspcodes.h diff --git a/libav/strptime.c b/libavformat/strptime.c index 7aece6a..7aece6a 100644 --- a/libav/strptime.c +++ b/libavformat/strptime.c diff --git a/libav/strptime.h b/libavformat/strptime.h index a1106fd..a1106fd 100644 --- a/libav/strptime.h +++ b/libavformat/strptime.h diff --git a/libav/swf.c b/libavformat/swf.c index 14f8707..14f8707 100644 --- a/libav/swf.c +++ b/libavformat/swf.c diff --git a/libav/tcp.c b/libavformat/tcp.c index 61d8665..61d8665 100644 --- a/libav/tcp.c +++ b/libavformat/tcp.c diff --git a/libav/udp.c b/libavformat/udp.c index 3d159ef..3d159ef 100644 --- a/libav/udp.c +++ b/libavformat/udp.c diff --git a/libav/utils.c b/libavformat/utils.c index 5a9aa08..5a9aa08 100644 --- a/libav/utils.c +++ b/libavformat/utils.c diff --git a/libav/wav.c b/libavformat/wav.c index f6bcd7b..f6bcd7b 100644 --- a/libav/wav.c +++ b/libavformat/wav.c diff --git a/vhook/Makefile b/vhook/Makefile index 296127d..d217e00 100644 --- a/vhook/Makefile +++ b/vhook/Makefile @@ -1,6 +1,6 @@ include ../config.mak -CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I../libav -I../libavcodec -DHAVE_AV_CONFIG_H +CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I../libavformat -I../libavcodec -DHAVE_AV_CONFIG_H ifeq ($(CONFIG_DARWIN),yes) LDFLAGS+=-bundle -flat_namespace -undefined suppress |
