renamed libav to libavformat

Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk

49 files changed, 10 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index c28de12e8b..4f2ff34aa2 100644
--- a/Makefile
+++ b/Makefile
@@ -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 0cc425cc33..0cc425cc33 100644
--- a/libav/.cvsignore
+++ b/libavformat/.cvsignore
diff --git a/libav/Makefile b/libavformat/Makefile
index 1051aa6543..1051aa6543 100644
--- a/libav/Makefile
+++ b/libavformat/Makefile
diff --git a/libav/allformats.c b/libavformat/allformats.c
index 8a65638e88..8a65638e88 100644
--- a/libav/allformats.c
+++ b/libavformat/allformats.c
diff --git a/libav/asf.c b/libavformat/asf.c
index 2f1ce12dc3..2f1ce12dc3 100644
--- a/libav/asf.c
+++ b/libavformat/asf.c
diff --git a/libav/au.c b/libavformat/au.c
index 8c3d62a595..8c3d62a595 100644
--- a/libav/au.c
+++ b/libavformat/au.c
diff --git a/libav/audio.c b/libavformat/audio.c
index 4fa155c85d..4fa155c85d 100644
--- a/libav/audio.c
+++ b/libavformat/audio.c
diff --git a/libav/avformat.h b/libavformat/avformat.h
index 0ea10f7dfe..0ea10f7dfe 100644
--- a/libav/avformat.h
+++ b/libavformat/avformat.h
diff --git a/libav/avi.h b/libavformat/avi.h
index d1b5eb5789..d1b5eb5789 100644
--- a/libav/avi.h
+++ b/libavformat/avi.h
diff --git a/libav/avidec.c b/libavformat/avidec.c
index 9646408cd1..9646408cd1 100644
--- a/libav/avidec.c
+++ b/libavformat/avidec.c
diff --git a/libav/avienc.c b/libavformat/avienc.c
index b4298b0b39..b4298b0b39 100644
--- a/libav/avienc.c
+++ b/libavformat/avienc.c
diff --git a/libav/avio.c b/libavformat/avio.c
index 37af56f9af..37af56f9af 100644
--- a/libav/avio.c
+++ b/libavformat/avio.c
diff --git a/libav/avio.h b/libavformat/avio.h
index 541eff5ae0..541eff5ae0 100644
--- a/libav/avio.h
+++ b/libavformat/avio.h
diff --git a/libav/aviobuf.c b/libavformat/aviobuf.c
index 2e931bd849..2e931bd849 100644
--- a/libav/aviobuf.c
+++ b/libavformat/aviobuf.c
diff --git a/libav/barpainet.c b/libavformat/barpainet.c
index c1e8877718..c1e8877718 100644
--- a/libav/barpainet.c
+++ b/libavformat/barpainet.c
diff --git a/libav/barpainet.h b/libavformat/barpainet.h
index 461403b3fa..461403b3fa 100644
--- a/libav/barpainet.h
+++ b/libavformat/barpainet.h
diff --git a/libav/beosaudio.cpp b/libavformat/beosaudio.cpp
index a1ae0a53c8..a1ae0a53c8 100644
--- a/libav/beosaudio.cpp
+++ b/libavformat/beosaudio.cpp
diff --git a/libav/crc.c b/libavformat/crc.c
index 553ab537cb..553ab537cb 100644
--- a/libav/crc.c
+++ b/libavformat/crc.c
diff --git a/libav/cutils.c b/libavformat/cutils.c
index ce2c845226..ce2c845226 100644
--- a/libav/cutils.c
+++ b/libavformat/cutils.c
diff --git a/libav/dv.c b/libavformat/dv.c
index 1f152a2fba..1f152a2fba 100644
--- a/libav/dv.c
+++ b/libavformat/dv.c
diff --git a/libav/ffm.c b/libavformat/ffm.c
index c21599c69f..c21599c69f 100644
--- a/libav/ffm.c
+++ b/libavformat/ffm.c
diff --git a/libav/file.c b/libavformat/file.c
index 8206ff9255..8206ff9255 100644
--- a/libav/file.c
+++ b/libavformat/file.c
diff --git a/libav/framehook.c b/libavformat/framehook.c
index 03ee32e188..03ee32e188 100644
--- a/libav/framehook.c
+++ b/libavformat/framehook.c
diff --git a/libav/framehook.h b/libavformat/framehook.h
index eb1a51f7e4..eb1a51f7e4 100644
--- a/libav/framehook.h
+++ b/libavformat/framehook.h
diff --git a/libav/gif.c b/libavformat/gif.c
index 6becf52a49..6becf52a49 100644
--- a/libav/gif.c
+++ b/libavformat/gif.c
diff --git a/libav/grab.c b/libavformat/grab.c
index 8173bac369..8173bac369 100644
--- a/libav/grab.c
+++ b/libavformat/grab.c
diff --git a/libav/http.c b/libavformat/http.c
index 7271a6da81..7271a6da81 100644
--- a/libav/http.c
+++ b/libavformat/http.c
diff --git a/libav/img.c b/libavformat/img.c
index 305cbb08f2..305cbb08f2 100644
--- a/libav/img.c
+++ b/libavformat/img.c
diff --git a/libav/jpeg.c b/libavformat/jpeg.c
index 6a19db6d67..6a19db6d67 100644
--- a/libav/jpeg.c
+++ b/libavformat/jpeg.c
diff --git a/libav/mov.c b/libavformat/mov.c
index 91c7155b08..91c7155b08 100644
--- a/libav/mov.c
+++ b/libavformat/mov.c
diff --git a/libav/mpeg.c b/libavformat/mpeg.c
index 748841881d..748841881d 100644
--- a/libav/mpeg.c
+++ b/libavformat/mpeg.c
diff --git a/libav/mpegts.c b/libavformat/mpegts.c
index 2947d960e8..2947d960e8 100644
--- a/libav/mpegts.c
+++ b/libavformat/mpegts.c
diff --git a/libav/ogg.c b/libavformat/ogg.c
index 7c7c96c61f..7c7c96c61f 100644
--- a/libav/ogg.c
+++ b/libavformat/ogg.c
diff --git a/libav/raw.c b/libavformat/raw.c
index 518206ea56..518206ea56 100644
--- a/libav/raw.c
+++ b/libavformat/raw.c
diff --git a/libav/rm.c b/libavformat/rm.c
index be90a27c89..be90a27c89 100644
--- a/libav/rm.c
+++ b/libavformat/rm.c
diff --git a/libav/rtp.c b/libavformat/rtp.c
index f36da6d41d..f36da6d41d 100644
--- a/libav/rtp.c
+++ b/libavformat/rtp.c
diff --git a/libav/rtp.h b/libavformat/rtp.h
index 0c0ae35ac0..0c0ae35ac0 100644
--- a/libav/rtp.h
+++ b/libavformat/rtp.h
diff --git a/libav/rtpproto.c b/libavformat/rtpproto.c
index 41823fc829..41823fc829 100644
--- a/libav/rtpproto.c
+++ b/libavformat/rtpproto.c
diff --git a/libav/rtsp.c b/libavformat/rtsp.c
index c173cb89b7..c173cb89b7 100644
--- a/libav/rtsp.c
+++ b/libavformat/rtsp.c
diff --git a/libav/rtsp.h b/libavformat/rtsp.h
index 3dd231571e..3dd231571e 100644
--- a/libav/rtsp.h
+++ b/libavformat/rtsp.h
diff --git a/libav/rtspcodes.h b/libavformat/rtspcodes.h
index b967cb932a..b967cb932a 100644
--- a/libav/rtspcodes.h
+++ b/libavformat/rtspcodes.h
diff --git a/libav/strptime.c b/libavformat/strptime.c
index 7aece6a08e..7aece6a08e 100644
--- a/libav/strptime.c
+++ b/libavformat/strptime.c
diff --git a/libav/strptime.h b/libavformat/strptime.h
index a1106fda40..a1106fda40 100644
--- a/libav/strptime.h
+++ b/libavformat/strptime.h
diff --git a/libav/swf.c b/libavformat/swf.c
index 14f8707f96..14f8707f96 100644
--- a/libav/swf.c
+++ b/libavformat/swf.c
diff --git a/libav/tcp.c b/libavformat/tcp.c
index 61d8665525..61d8665525 100644
--- a/libav/tcp.c
+++ b/libavformat/tcp.c
diff --git a/libav/udp.c b/libavformat/udp.c
index 3d159ef4f8..3d159ef4f8 100644
--- a/libav/udp.c
+++ b/libavformat/udp.c
diff --git a/libav/utils.c b/libavformat/utils.c
index 5a9aa082f4..5a9aa082f4 100644
--- a/libav/utils.c
+++ b/libavformat/utils.c
diff --git a/libav/wav.c b/libavformat/wav.c
index f6bcd7b0e5..f6bcd7b0e5 100644
--- a/libav/wav.c
+++ b/libavformat/wav.c
diff --git a/vhook/Makefile b/vhook/Makefile
index 296127daec..d217e00b2f 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