From cd68e1618b17b525bd49757b2f5e245a6cb1a495 Mon Sep 17 00:00:00 2001 From: rtognimp Date: Fri, 5 Aug 2005 19:57:47 +0000 Subject: Demuxer modularization Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_rawvideo.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'libmpdemux/demux_rawvideo.c') diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c index b0ef178081..113c4b09f3 100644 --- a/libmpdemux/demux_rawvideo.c +++ b/libmpdemux/demux_rawvideo.c @@ -53,7 +53,7 @@ m_option_t demux_rawvideo_opts[] = { }; -int demux_rawvideo_open(demuxer_t* demuxer) { +static demuxer_t* demux_rawvideo_open(demuxer_t* demuxer) { sh_video_t* sh_video; switch(size_id){ @@ -100,10 +100,10 @@ int demux_rawvideo_open(demuxer_t* demuxer) { demuxer->video->sh = sh_video; sh_video->ds = demuxer->video; - return 1; + return demuxer; } -int demux_rawvideo_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) { +static int demux_rawvideo_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) { sh_video_t* sh = demuxer->video->sh; off_t pos; if(demuxer->stream->eof) return 0; @@ -113,7 +113,7 @@ int demux_rawvideo_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) { return 1; } -void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ +static void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ stream_t* s = demuxer->stream; sh_video_t* sh_video = demuxer->video->sh; off_t pos; @@ -131,3 +131,20 @@ void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ demuxer->video->pts = pos * sh_video->frametime; // printf("demux_rawvideo: streamtell=%d\n",(int)stream_tell(demuxer->stream)); } + + +demuxer_desc_t demuxer_desc_rawvideo = { + "Raw video demuxer", + "rawvideo", + "rawvideo", + "?", + "", + DEMUXER_TYPE_RAWVIDEO, + 0, // no autodetect + NULL, + demux_rawvideo_fill_buffer, + demux_rawvideo_open, + NULL, + demux_rawvideo_seek, + NULL +}; -- cgit v1.2.3