renamed libav to libavformat

Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Fabrice Bellard 22 years ago
parent 57fc257642
commit abac617591
  1. 18
      Makefile
  2. 0
      libavformat/.cvsignore
  3. 0
      libavformat/Makefile
  4. 0
      libavformat/allformats.c
  5. 0
      libavformat/asf.c
  6. 0
      libavformat/au.c
  7. 0
      libavformat/audio.c
  8. 0
      libavformat/avformat.h
  9. 0
      libavformat/avi.h
  10. 0
      libavformat/avidec.c
  11. 0
      libavformat/avienc.c
  12. 0
      libavformat/avio.c
  13. 0
      libavformat/avio.h
  14. 0
      libavformat/aviobuf.c
  15. 0
      libavformat/barpainet.c
  16. 0
      libavformat/barpainet.h
  17. 0
      libavformat/beosaudio.cpp
  18. 0
      libavformat/crc.c
  19. 0
      libavformat/cutils.c
  20. 0
      libavformat/dv.c
  21. 0
      libavformat/ffm.c
  22. 0
      libavformat/file.c
  23. 0
      libavformat/framehook.c
  24. 0
      libavformat/framehook.h
  25. 0
      libavformat/gif.c
  26. 0
      libavformat/grab.c
  27. 0
      libavformat/http.c
  28. 0
      libavformat/img.c
  29. 0
      libavformat/jpeg.c
  30. 0
      libavformat/mov.c
  31. 0
      libavformat/mpeg.c
  32. 0
      libavformat/mpegts.c
  33. 0
      libavformat/ogg.c
  34. 0
      libavformat/raw.c
  35. 0
      libavformat/rm.c
  36. 0
      libavformat/rtp.c
  37. 0
      libavformat/rtp.h
  38. 0
      libavformat/rtpproto.c
  39. 0
      libavformat/rtsp.c
  40. 0
      libavformat/rtsp.h
  41. 0
      libavformat/rtspcodes.h
  42. 0
      libavformat/strptime.c
  43. 0
      libavformat/strptime.h
  44. 0
      libavformat/swf.c
  45. 0
      libavformat/tcp.c
  46. 0
      libavformat/udp.c
  47. 0
      libavformat/utils.c
  48. 0
      libavformat/wav.c
  49. 2
      vhook/Makefile

@ -6,7 +6,7 @@ include config.mak
VPATH=$(SRC_PATH) 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) ifeq ($(CONFIG_DARWIN),yes)
LDFLAGS+= -g -d LDFLAGS+= -g -d
FFSLDFLAGS= -Wl,-bind_at_load FFSLDFLAGS= -Wl,-bind_at_load
@ -33,9 +33,9 @@ EXTRALIBS+=-lmedia -lbe
endif endif
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a DEP_LIBS=libavcodec/libavcodec.so libavformat/libavformat.a
else else
DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a DEP_LIBS=libavcodec/libavcodec.a libavformat/libavformat.a
ifeq ($(CONFIG_MP3LAME),yes) ifeq ($(CONFIG_MP3LAME),yes)
EXTRALIBS+=-lmp3lame EXTRALIBS+=-lmp3lame
endif endif
@ -60,10 +60,10 @@ all: lib $(PROG) $(VHOOK)
lib: lib:
$(MAKE) -C libavcodec all $(MAKE) -C libavcodec all
$(MAKE) -C libav all $(MAKE) -C libavformat all
ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS) 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) -lavformat -lavcodec $(EXTRALIBS)
ffmpeg$(EXE): ffmpeg_g$(EXE) ffmpeg$(EXE): ffmpeg_g$(EXE)
@ -71,7 +71,7 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
ffserver$(EXE): ffserver.o $(DEP_LIBS) ffserver$(EXE): ffserver.o $(DEP_LIBS)
$(CC) $(LDFLAGS) $(FFSLDFLAGS) \ $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
-o $@ ffserver.o -L./libavcodec -L./libav \ -o $@ ffserver.o -L./libavcodec -L./libavformat \
-lavformat -lavcodec -ldl $(EXTRALIBS) -lavformat -lavcodec -ldl $(EXTRALIBS)
ffplay: ffmpeg$(EXE) ffplay: ffmpeg$(EXE)
@ -97,7 +97,7 @@ $(prefix)/lib/vhook:
installlib: installlib:
$(MAKE) -C libavcodec installlib $(MAKE) -C libavcodec installlib
$(MAKE) -C libav installlib $(MAKE) -C libavformat installlib
dep: depend dep: depend
@ -106,7 +106,7 @@ depend:
clean: $(CLEANVHOOK) clean: $(CLEANVHOOK)
$(MAKE) -C libavcodec clean $(MAKE) -C libavcodec clean
$(MAKE) -C libav clean $(MAKE) -C libavformat clean
$(MAKE) -C tests clean $(MAKE) -C tests clean
rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG)
@ -118,7 +118,7 @@ distclean: clean
rm -f config.mak config.h rm -f config.mak config.h
TAGS: TAGS:
etags *.[ch] libav/*.[ch] libavcodec/*.[ch] etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
# regression tests # regression tests

@ -1,6 +1,6 @@
include ../config.mak 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) ifeq ($(CONFIG_DARWIN),yes)
LDFLAGS+=-bundle -flat_namespace -undefined suppress LDFLAGS+=-bundle -flat_namespace -undefined suppress

Loading…
Cancel
Save