Commit 27d5f18f authored by François Revol's avatar François Revol
Browse files

First implementation of nsv demuxer.

Get libavformat linked with lavc and lmp3lame is required. BeOS requires no undefined syms on link! (besides it's bad to leave undef syms)

Originally committed as revision 3696 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 55429b55
......@@ -16,7 +16,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
sierravmd.o matroska.o sol.o electronicarts.o
sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o
ifeq ($(CONFIG_RISKY),yes)
OBJS+= asf.o
......@@ -83,6 +83,11 @@ ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
endif
EXTRALIBS+=-lavcodec -L../libavcodec
ifeq ($(CONFIG_MP3LAME),yes)
EXTRALIBS+=-lmp3lame
endif
SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
all: $(LIB) $(SLIB)
......
......@@ -110,6 +110,7 @@ void av_register_all(void)
matroska_init();
sol_init();
ea_init();
nsvdec_init();
#ifdef CONFIG_ENCODERS
/* image formats */
......
......@@ -510,6 +510,9 @@ int sol_init(void);
/* electronicarts.c */
int ea_init(void);
/* nsvdec.c */
int nsvdec_init(void);
#include "rtp.h"
#include "rtsp.h"
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment