From 8eaa63689a25be909dc31c6a2c8c9dad3777943a Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 29 Dec 2014 23:09:50 +0100 Subject: demux_mf: move mf.c contents to demux_mf.c There's no reason why parts of this demuxer would be in a separate source file. The existence of this code is already somewhat questionable anyway, so it may as well be dumped into a single file. Even stranger that demux.c included mf.h for no reason (it was an artifact from 2002 when the architecture was uncleaner). --- demux/mf.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 demux/mf.h (limited to 'demux/mf.h') diff --git a/demux/mf.h b/demux/mf.h deleted file mode 100644 index 09f6e03b4f..0000000000 --- a/demux/mf.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer 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. - * - * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_MF_H -#define MPLAYER_MF_H - -struct mp_log; - -extern double mf_fps; -extern char * mf_type; - -typedef struct mf { - struct mp_log *log; - struct sh_video *sh; - int curr_frame; - int nr_of_files; - char **names; - // optional - struct stream **streams; -} mf_t; - -mf_t *open_mf_pattern(void *talloc_ctx, struct mp_log *log, char *filename); -mf_t *open_mf_single(void *talloc_ctx, struct mp_log *log, char *filename); - -#endif /* MPLAYER_MF_H */ -- cgit v1.2.3