falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

renamed libav to libavformat 

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

+ 9
- 9
Makefile View File

@@ -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



libav/.cvsignore → libavformat/.cvsignore View File


libav/Makefile → libavformat/Makefile View File


libav/allformats.c → libavformat/allformats.c View File


libav/asf.c → libavformat/asf.c View File


libav/au.c → libavformat/au.c View File


libav/audio.c → libavformat/audio.c View File


libav/avformat.h → libavformat/avformat.h View File


libav/avi.h → libavformat/avi.h View File


libav/avidec.c → libavformat/avidec.c View File


libav/avienc.c → libavformat/avienc.c View File


libav/avio.c → libavformat/avio.c View File


libav/avio.h → libavformat/avio.h View File


libav/aviobuf.c → libavformat/aviobuf.c View File


libav/barpainet.c → libavformat/barpainet.c View File


libav/barpainet.h → libavformat/barpainet.h View File


libav/beosaudio.cpp → libavformat/beosaudio.cpp View File


libav/crc.c → libavformat/crc.c View File


libav/cutils.c → libavformat/cutils.c View File


libav/dv.c → libavformat/dv.c View File


libav/ffm.c → libavformat/ffm.c View File


libav/file.c → libavformat/file.c View File


libav/framehook.c → libavformat/framehook.c View File


libav/framehook.h → libavformat/framehook.h View File


libav/gif.c → libavformat/gif.c View File


libav/grab.c → libavformat/grab.c View File


libav/http.c → libavformat/http.c View File


libav/img.c → libavformat/img.c View File


libav/jpeg.c → libavformat/jpeg.c View File


libav/mov.c → libavformat/mov.c View File


libav/mpeg.c → libavformat/mpeg.c View File


libav/mpegts.c → libavformat/mpegts.c View File


libav/ogg.c → libavformat/ogg.c View File


libav/raw.c → libavformat/raw.c View File


libav/rm.c → libavformat/rm.c View File


libav/rtp.c → libavformat/rtp.c View File


libav/rtp.h → libavformat/rtp.h View File


libav/rtpproto.c → libavformat/rtpproto.c View File


libav/rtsp.c → libavformat/rtsp.c View File


libav/rtsp.h → libavformat/rtsp.h View File


libav/rtspcodes.h → libavformat/rtspcodes.h View File


libav/strptime.c → libavformat/strptime.c View File


libav/strptime.h → libavformat/strptime.h View File


libav/swf.c → libavformat/swf.c View File


libav/tcp.c → libavformat/tcp.c View File


libav/udp.c → libavformat/udp.c View File


libav/utils.c → libavformat/utils.c View File


libav/wav.c → libavformat/wav.c View File


+ 1
- 1
vhook/Makefile View File

@@ -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


Write Preview
Loading…
Cancel
Save