Commit 3f16d933 authored by Mike Melanson's avatar Mike Melanson

first pass at PSX STR demuxer; does not yet interact correctly with MDEC

video decoder

Originally committed as revision 2190 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 421e0859
......@@ -14,7 +14,7 @@ PPOBJS=
# mux and demuxes
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 dvcore.o dv.o \
yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o
yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o
ifeq ($(CONFIG_RISKY),yes)
OBJS+= asf.o
......
......@@ -51,6 +51,7 @@ void av_register_all(void)
fourxm_init();
flvenc_init();
flvdec_init();
str_init();
#ifdef AMR_NB
amr_init();
......
......@@ -380,6 +380,9 @@ int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
/* 4xm.c */
int fourxm_init(void);
/* psxstr.c */
int str_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