Commit ee201f11 authored by tmmm's avatar tmmm

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

video decoder


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2190 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent deb3128d
...@@ -14,7 +14,7 @@ PPOBJS= ...@@ -14,7 +14,7 @@ PPOBJS=
# mux and demuxes # mux and demuxes
OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \ 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 \ 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) ifeq ($(CONFIG_RISKY),yes)
OBJS+= asf.o OBJS+= asf.o
......
...@@ -51,6 +51,7 @@ void av_register_all(void) ...@@ -51,6 +51,7 @@ void av_register_all(void)
fourxm_init(); fourxm_init();
flvenc_init(); flvenc_init();
flvdec_init(); flvdec_init();
str_init();
#ifdef AMR_NB #ifdef AMR_NB
amr_init(); amr_init();
......
...@@ -380,6 +380,9 @@ int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f); ...@@ -380,6 +380,9 @@ int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
/* 4xm.c */ /* 4xm.c */
int fourxm_init(void); int fourxm_init(void);
/* psxstr.c */
int str_init(void);
#include "rtp.h" #include "rtp.h"
#include "rtsp.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