matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)

Originally committed as revision 2872 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 21 years ago
parent 1da57984e6
commit 08abe0fd66
  1. 2
      libavformat/Makefile
  2. 1
      libavformat/allformats.c
  3. 3
      libavformat/avformat.h
  4. 2689
      libavformat/matroska.c

@ -16,7 +16,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.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
sierravmd.o matroska.o
ifeq ($(CONFIG_RISKY),yes)
OBJS+= asf.o

@ -96,6 +96,7 @@ void av_register_all(void)
#endif
nut_init();
matroska_init();
#ifdef CONFIG_ENCODERS
/* image formats */

@ -483,6 +483,9 @@ int flic_init(void);
/* sierravmd.c */
int vmd_init(void);
/* matroska.c */
int matroska_init(void);
#include "rtp.h"
#include "rtsp.h"

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save