Mercurial > mplayer.hg

comparison libmpdemux/matroska.h @ 26281:6eb659782586

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary includes command.c: Don't include libmpcodecs/mp_image.h, libmpdemux/matroska.h mplayer.c: Don't include libmpdemux/matroska.h matroska.h: Remove declaration of already removed function demux_mkv_change_subs and stop including demuxer.h
author uau
date Tue, 01 Apr 2008 15:24:53 +0000
parents 268ecf0e1ba4
children d643e4643313
comparison
equal deleted inserted replaced
26280:b21e1506e50b 26281:6eb659782586
4 * see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html 4 * see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html
5 */ 5 */
6 6
7 #ifndef MPLAYER_MATROSKA_H 7 #ifndef MPLAYER_MATROSKA_H
8 #define MPLAYER_MATROSKA_H 8 #define MPLAYER_MATROSKA_H
9
10 #include "demuxer.h"
11 9
12 #define MKV_A_AAC_2MAIN "A_AAC/MPEG2/MAIN" 10 #define MKV_A_AAC_2MAIN "A_AAC/MPEG2/MAIN"
13 #define MKV_A_AAC_2LC "A_AAC/MPEG2/LC" 11 #define MKV_A_AAC_2LC "A_AAC/MPEG2/LC"
14 #define MKV_A_AAC_2SBR "A_AAC/MPEG2/LC/SBR" 12 #define MKV_A_AAC_2SBR "A_AAC/MPEG2/LC/SBR"
15 #define MKV_A_AAC_2SSR "A_AAC/MPEG2/SSR" 13 #define MKV_A_AAC_2SSR "A_AAC/MPEG2/SSR"
61 #define MKV_S_TEXTASS "S_TEXT/ASS" 59 #define MKV_S_TEXTASS "S_TEXT/ASS"
62 #define MKV_S_VOBSUB "S_VOBSUB" 60 #define MKV_S_VOBSUB "S_VOBSUB"
63 #define MKV_S_SSA "S_SSA" // Deprecated 61 #define MKV_S_SSA "S_SSA" // Deprecated
64 #define MKV_S_ASS "S_ASS" // Deprecated 62 #define MKV_S_ASS "S_ASS" // Deprecated
65 63
66 int demux_mkv_change_subs(demuxer_t *demuxer, int new_num);
67
68 #endif /* MPLAYER_MATROSKA_H */ 64 #endif /* MPLAYER_MATROSKA_H */