Commit 94161f59 authored by michael's avatar michael

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2872 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 493f6db1
......@@ -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"
......
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