From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 5 Nov 2012 17:02:04 +0100 Subject: 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. --- demux/matroska.h | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 demux/matroska.h (limited to 'demux/matroska.h') diff --git a/demux/matroska.h b/demux/matroska.h new file mode 100644 index 0000000000..6d56008cb1 --- /dev/null +++ b/demux/matroska.h @@ -0,0 +1,86 @@ +/* + * CodecID definitions for Matroska files + * + * see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html + * + * 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_MATROSKA_H +#define MPLAYER_MATROSKA_H + +#define MKV_A_AAC_2MAIN "A_AAC/MPEG2/MAIN" +#define MKV_A_AAC_2LC "A_AAC/MPEG2/LC" +#define MKV_A_AAC_2SBR "A_AAC/MPEG2/LC/SBR" +#define MKV_A_AAC_2SSR "A_AAC/MPEG2/SSR" +#define MKV_A_AAC_4MAIN "A_AAC/MPEG4/MAIN" +#define MKV_A_AAC_4LC "A_AAC/MPEG4/LC" +#define MKV_A_AAC_4SBR "A_AAC/MPEG4/LC/SBR" +#define MKV_A_AAC_4SSR "A_AAC/MPEG4/SSR" +#define MKV_A_AAC_4LTP "A_AAC/MPEG4/LTP" +#define MKV_A_AAC "A_AAC" +#define MKV_A_AC3 "A_AC3" +#define MKV_A_DTS "A_DTS" +#define MKV_A_EAC3 "A_EAC3" +#define MKV_A_MP2 "A_MPEG/L2" +#define MKV_A_MP3 "A_MPEG/L3" +#define MKV_A_PCM "A_PCM/INT/LIT" +#define MKV_A_PCM_BE "A_PCM/INT/BIG" +#define MKV_A_VORBIS "A_VORBIS" +#define MKV_A_ACM "A_MS/ACM" +#define MKV_A_REAL28 "A_REAL/28_8" +#define MKV_A_REALATRC "A_REAL/ATRC" +#define MKV_A_REALCOOK "A_REAL/COOK" +#define MKV_A_REALDNET "A_REAL/DNET" +#define MKV_A_REALSIPR "A_REAL/SIPR" +#define MKV_A_QDMC "A_QUICKTIME/QDMC" +#define MKV_A_QDMC2 "A_QUICKTIME/QDM2" +#define MKV_A_FLAC "A_FLAC" +#define MKV_A_TTA1 "A_TTA1" +#define MKV_A_WAVPACK "A_WAVPACK4" +#define MKV_A_TRUEHD "A_TRUEHD" + +#define MKV_V_MSCOMP "V_MS/VFW/FOURCC" +#define MKV_V_REALV10 "V_REAL/RV10" +#define MKV_V_REALV20 "V_REAL/RV20" +#define MKV_V_REALV30 "V_REAL/RV30" +#define MKV_V_REALV40 "V_REAL/RV40" +#define MKV_V_SORENSONV1 "V_SORENSON/V1" +#define MKV_V_SORENSONV2 "V_SORENSON/V2" +#define MKV_V_SORENSONV3 "V_SORENSON/V3" +#define MKV_V_CINEPAK "V_CINEPAK" +#define MKV_V_QUICKTIME "V_QUICKTIME" +#define MKV_V_MPEG1 "V_MPEG1" +#define MKV_V_MPEG2 "V_MPEG2" +#define MKV_V_MPEG4_SP "V_MPEG4/ISO/SP" +#define MKV_V_MPEG4_ASP "V_MPEG4/ISO/ASP" +#define MKV_V_MPEG4_AP "V_MPEG4/ISO/AP" +#define MKV_V_MPEG4_AVC "V_MPEG4/ISO/AVC" +#define MKV_V_THEORA "V_THEORA" +#define MKV_V_VP8 "V_VP8" +#define MKV_V_MJPEG "V_MJPEG" + +#define MKV_S_TEXTASCII "S_TEXT/ASCII" +#define MKV_S_TEXTUTF8 "S_TEXT/UTF8" +#define MKV_S_TEXTSSA "S_TEXT/SSA" +#define MKV_S_TEXTASS "S_TEXT/ASS" +#define MKV_S_VOBSUB "S_VOBSUB" +#define MKV_S_PGS "S_HDMV/PGS" +#define MKV_S_SSA "S_SSA" // Deprecated +#define MKV_S_ASS "S_ASS" // Deprecated + +#endif /* MPLAYER_MATROSKA_H */ -- cgit v1.2.3