diff options
author | wm4 <wm4@nowhere> | 2012-11-05 17:02:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:06:14 +0100 |
commit | d4bdd0473d6f43132257c9fb3848d829755167a3 (patch) | |
tree | 8021c2f7da1841393c8c832105e20cd527826d6c /libmpcodecs/vf_format.c | |
parent | bd48deba77bd5582c5829d6fe73a7d2571088aba (diff) | |
download | mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2 mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz |
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.
Renames the following directories:
libaf -> audio/filter
libao2 -> audio/out
libvo -> video/out
libmpdemux -> demux
Split libmpcodecs:
vf* -> video/filter
vd*, dec_video.* -> video/decode
mp_image*, img_format*, ... -> video/
ad*, dec_audio.* -> audio/decode
libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.
Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.
sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).
Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
Diffstat (limited to 'libmpcodecs/vf_format.c')
-rw-r--r-- | libmpcodecs/vf_format.c | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/libmpcodecs/vf_format.c b/libmpcodecs/vf_format.c deleted file mode 100644 index 422956539b..0000000000 --- a/libmpcodecs/vf_format.c +++ /dev/null @@ -1,91 +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. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <inttypes.h> - -#include "config.h" -#include "mp_msg.h" - -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" - -#include "m_option.h" -#include "m_struct.h" - -static struct vf_priv_s { - unsigned int fmt; - unsigned int outfmt; -} const vf_priv_dflt = { - IMGFMT_YUY2, - 0 -}; - -//===========================================================================// - -static int query_format(struct vf_instance *vf, unsigned int fmt){ - if(fmt==vf->priv->fmt) { - if (vf->priv->outfmt) - fmt = vf->priv->outfmt; - return vf_next_query_format(vf,fmt); - } - return 0; -} - -static int config(struct vf_instance *vf, int width, int height, - int d_width, int d_height, - unsigned flags, unsigned outfmt){ - return vf_next_config(vf, width, height, d_width, d_height, flags, vf->priv->outfmt); -} - -static int vf_open(vf_instance_t *vf, char *args){ - vf->query_format=query_format; - vf->draw_slice=vf_next_draw_slice; - vf->default_caps=0; - if (vf->priv->outfmt) - vf->config=config; - return 1; -} - -#define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f) -static const m_option_t vf_opts_fields[] = { - {"fmt", ST_OFF(fmt), CONF_TYPE_IMGFMT, 0,0 ,0, NULL}, - {"outfmt", ST_OFF(outfmt), CONF_TYPE_IMGFMT, 0,0 ,0, NULL}, - { NULL, NULL, 0, 0, 0, 0, NULL } -}; - -static const m_struct_t vf_opts = { - "format", - sizeof(struct vf_priv_s), - &vf_priv_dflt, - vf_opts_fields -}; - -const vf_info_t vf_info_format = { - "force output format", - "format", - "A'rpi", - "FIXME! get_image()/put_image()", - vf_open, - &vf_opts -}; - -//===========================================================================// |