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_nuv.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'libmpdemux/demux_nuv.c') diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c index a156f28b56..a29dddf538 100644 --- a/libmpdemux/demux_nuv.c +++ b/libmpdemux/demux_nuv.c @@ -63,7 +63,7 @@ static int nearestBitrate(int bitrate) { /** * Seek to a position relative to the current position, indicated in time. */ -void demux_seek_nuv ( demuxer_t *demuxer, float rel_seek_secs, int flags ) +static void demux_seek_nuv ( demuxer_t *demuxer, float rel_seek_secs, int flags ) { #define MAX_TIME 1000000 nuv_priv_t* priv = demuxer->priv; @@ -152,7 +152,7 @@ void demux_seek_nuv ( demuxer_t *demuxer, float rel_seek_secs, int flags ) } -int demux_nuv_fill_buffer ( demuxer_t *demuxer ) +static int demux_nuv_fill_buffer ( demuxer_t *demuxer, demux_stream_t *ds ) { struct rtframeheader rtjpeg_frameheader; off_t orig_pos; @@ -309,7 +309,7 @@ out: return 0; } -demuxer_t* demux_open_nuv ( demuxer_t* demuxer ) +static demuxer_t* demux_open_nuv ( demuxer_t* demuxer ) { sh_video_t *sh_video = NULL; sh_audio_t *sh_audio = NULL; @@ -404,7 +404,7 @@ demuxer_t* demux_open_nuv ( demuxer_t* demuxer ) return demuxer; } -int nuv_check_file ( demuxer_t* demuxer ) +static int nuv_check_file ( demuxer_t* demuxer ) { struct nuv_signature ns; @@ -426,10 +426,10 @@ int nuv_check_file ( demuxer_t* demuxer ) /* Return to original position */ stream_seek ( demuxer->stream, orig_pos ); - return 1; + return DEMUXER_TYPE_NUV; } -void demux_close_nuv(demuxer_t* demuxer) { +static void demux_close_nuv(demuxer_t* demuxer) { nuv_priv_t* priv = demuxer->priv; nuv_position_t* pos; if(!priv) @@ -441,3 +441,20 @@ void demux_close_nuv(demuxer_t* demuxer) { } free(priv); } + + +demuxer_desc_t demuxer_desc_nuv = { + "NuppelVideo demuxer", + "nuv", + "NuppelVideo", + "Panagiotis Issaris", + "", + DEMUXER_TYPE_NUV, + 1, // safe autodetect + nuv_check_file, + demux_nuv_fill_buffer, + demux_open_nuv, + demux_close_nuv, + demux_seek_nuv, + NULL +}; -- cgit v1.2.3