diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-05 11:03:43 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-05 11:03:43 +0000 |
| commit | 04d8819f7466f54469ed7ac5860d1edf2c4ae9bd (patch) | |
| tree | 53ed95b6719bcff64d5015949a996ec33d672e0e /libmpdemux/matroska.h | |
| parent | b95bcb2bc8494ab784bca804a380c06a25bae566 (diff) | |
| download | mpv-04d8819f7466f54469ed7ac5860d1edf2c4ae9bd.tar.bz2 mpv-04d8819f7466f54469ed7ac5860d1edf2c4ae9bd.tar.xz | |
Support for HE-AAC in Matroska. Also only set ds->pts to the first pts of a laced block, and set dp->pts to the current pts taking default_duration into account.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11558 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/matroska.h')
| -rw-r--r-- | libmpdemux/matroska.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index c3a13c6a3d..f9a1490d78 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -9,12 +9,13 @@ #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_4SBR "A_AAC/MPEG4/SBR" #define MKV_A_AC3 "A_AC3" #define MKV_A_DTS "A_DTS" #define MKV_A_MP2 "A_MPEG/L2" |