added dedicated file for mf:// input

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19307 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ben 2006-08-03 19:43:02 +00:00
parent e503389acf
commit d844273899
5 changed files with 51 additions and 5 deletions

View File

@ -22,6 +22,7 @@ endif
SRCS += stream.c \
stream_cue.c \
stream_file.c \
stream_mf.c \
stream_null.c \
ifeq ($(HAVE_DVD),yes)

View File

@ -79,6 +79,7 @@ extern stream_info_t stream_info_rtsp_sip;
extern stream_info_t stream_info_cue;
extern stream_info_t stream_info_null;
extern stream_info_t stream_info_mf;
extern stream_info_t stream_info_file;
#ifdef HAVE_DVD
extern stream_info_t stream_info_dvd;
@ -131,6 +132,7 @@ stream_info_t* auto_open_streams[] = {
#endif
&stream_info_null,
&stream_info_mf,
&stream_info_file,
NULL
};

View File

@ -23,6 +23,7 @@
#define STREAMTYPE_SDP 15
#define STREAMTYPE_PVR 16
#define STREAMTYPE_TV 17
#define STREAMTYPE_MF 18
#define STREAM_BUFFER_SIZE 2048

46
stream/stream_mf.c Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (C) 2006 Benjamin Zores
* Stream layer for multiple files input, based on previous work from Albeu
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include "stream.h"
#include "demuxer.h"
static int
mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
{
stream->type = STREAMTYPE_MF;
*file_format = DEMUXER_TYPE_MF;
return STREAM_OK;
}
stream_info_t stream_info_mf = {
"Multiple files input",
"mf",
"Benjamin Zores, Albeu",
"",
mf_stream_open,
{ "mf", NULL },
NULL,
1
};

View File

@ -10,9 +10,6 @@
static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
stream->type = STREAMTYPE_DUMMY;
if(strncmp("mf://",stream->url,5) == 0) {
*file_format = DEMUXER_TYPE_MF;
}
return 1;
}
@ -23,8 +20,7 @@ stream_info_t stream_info_null = {
"Albeu",
"",
open_s,
{
"mf", "null", NULL },
{ "null", NULL },
NULL,
0 // Urls are an option string
};