diff options
author | wm4 <wm4@mplayer2.org> | 2012-01-18 04:18:41 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-01-18 04:18:41 +0100 |
commit | f341b21a90d27977562645fb80f0cbbc2a17af7b (patch) | |
tree | af4b95b39fa865ddcaa5a448b7e04a0f5e220f57 /access_mpcontext.h | |
parent | 4e76c7514f847648cdc9740d6ef997d1653effa8 (diff) | |
parent | c4093e7d872d2daa485029b8b36661411387ef37 (diff) | |
download | mpv-f341b21a90d27977562645fb80f0cbbc2a17af7b.tar.bz2 mpv-f341b21a90d27977562645fb80f0cbbc2a17af7b.tar.xz |
Merge remote-tracking branch 'origin/master' into my_master
Diffstat (limited to 'access_mpcontext.h')
-rw-r--r-- | access_mpcontext.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/access_mpcontext.h b/access_mpcontext.h deleted file mode 100644 index 4b866f255f..0000000000 --- a/access_mpcontext.h +++ /dev/null @@ -1,30 +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_ACCESS_MPCONTEXT_H -#define MPLAYER_ACCESS_MPCONTEXT_H - -struct MPContext; -void *mpctx_get_video_out(struct MPContext *mpctx); -void *mpctx_get_demuxer(struct MPContext *mpctx); -void *mpctx_get_playtree_iter(struct MPContext *mpctx); -void *mpctx_get_mixer(struct MPContext *mpctx); -int mpctx_get_global_sub_size(struct MPContext *mpctx); -int mpctx_get_osd_function(struct MPContext *mpctx); - -#endif /* MPLAYER_ACCESS_MPCONTEXT_H */ |