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 /codec-cfg.h | |
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 'codec-cfg.h')
-rw-r--r-- | codec-cfg.h | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/codec-cfg.h b/codec-cfg.h deleted file mode 100644 index 480f570bba..0000000000 --- a/codec-cfg.h +++ /dev/null @@ -1,93 +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_CODEC_CFG_H -#define MPLAYER_CODEC_CFG_H - -#include <stdbool.h> - -#define CODECS_MAX_FOURCC 92 -#define CODECS_MAX_OUTFMT 16 -#define CODECS_MAX_INFMT 16 - -// Global flags: -#define CODECS_FLAG_SEEKABLE (1<<0) -#define CODECS_FLAG_ALIGN16 (1<<1) - -// Outfmt flags: -#define CODECS_FLAG_FLIP (1<<0) -#define CODECS_FLAG_NOFLIP (1<<1) -#define CODECS_FLAG_YUVHACK (1<<2) -#define CODECS_FLAG_QUERY (1<<3) -#define CODECS_FLAG_STATIC (1<<4) - -#define CODECS_STATUS__MIN 0 -#define CODECS_STATUS_NOT_WORKING -1 -#define CODECS_STATUS_PROBLEMS 0 -#define CODECS_STATUS_WORKING 1 -#define CODECS_STATUS_UNTESTED 2 -#define CODECS_STATUS__MAX 2 - - -#if !defined(GUID_TYPE) && !defined(GUID_DEFINED) -#define GUID_TYPE 1 -#define GUID_DEFINED 1 -typedef struct { - unsigned long f1; - unsigned short f2; - unsigned short f3; - unsigned char f4[8]; -} GUID; -#endif - - -typedef struct codecs { - unsigned int fourcc[CODECS_MAX_FOURCC]; - unsigned int fourccmap[CODECS_MAX_FOURCC]; - unsigned int outfmt[CODECS_MAX_OUTFMT]; - unsigned char outflags[CODECS_MAX_OUTFMT]; - unsigned int infmt[CODECS_MAX_INFMT]; - unsigned char inflags[CODECS_MAX_INFMT]; - char *name; - char *info; - char *comment; - char *dll; - char* drv; - GUID guid; - short flags; - short status; - bool anyinput; -} codecs_t; - -int parse_codec_cfg(const char *cfgfile); -codecs_t* find_video_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start, int force); -codecs_t* find_audio_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start, int force); -codecs_t* find_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start, int audioflag, int force); -void list_codecs(int audioflag); -void codecs_uninit_free(void); - -typedef char ** stringset_t; -void stringset_init(stringset_t *set); -void stringset_free(stringset_t *set); -void stringset_add(stringset_t *set, const char *str); -int stringset_test(stringset_t *set, const char *str); - -#endif /* MPLAYER_CODEC_CFG_H */ |