diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-22 10:13:28 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-22 10:13:28 +0000 |
| commit | d7a113f20d07d70bc77c20bd49f7e9e7e2aa6b84 (patch) | |
| tree | dad1947e3c464b34398354abd261d226a97ce4ce | |
| parent | 72fe5b36ee418c3d639fc8e60a0ebbe6df91a299 (diff) | |
| download | mpv-d7a113f20d07d70bc77c20bd49f7e9e7e2aa6b84.tar.bz2 mpv-d7a113f20d07d70bc77c20bd49f7e9e7e2aa6b84.tar.xz | |
Added support for A_AAC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16825 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/demux_mkv.c | 13 | ||||
| -rw-r--r-- | libmpdemux/matroska.h | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index e0b44fc7db..74a8519317 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1773,7 +1773,8 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track) !strncmp(track->codec_id, MKV_A_AAC_4LC, strlen(MKV_A_AAC_4LC)) || !strcmp(track->codec_id, MKV_A_AAC_4SSR) || - !strcmp(track->codec_id, MKV_A_AAC_4LTP)) + !strcmp(track->codec_id, MKV_A_AAC_4LTP) || + !strcmp(track->codec_id, MKV_A_AAC)) track->a_formattag = mmioFOURCC('M', 'P', '4', 'A'); else if (!strcmp(track->codec_id, MKV_A_VORBIS)) { @@ -1874,6 +1875,16 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track) sh_a->wf->nAvgBytesPerSec = 16000; sh_a->wf->nBlockAlign = 1024; + if (!strcmp (track->codec_id, MKV_A_AAC) && + (NULL != track->private_data)) + { + sh_a->codecdata=(unsigned char *)malloc(track->private_size); + memcpy (sh_a->codecdata, track->private_data, + track->private_size); + sh_a->codecdata_len = track->private_size; + return 0; + } + /* Recreate the 'private data' */ /* which faad2 uses in its initialization */ srate_idx = aac_get_sample_rate_index (sh_a->samplerate); diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index 7b89857b11..fa55645b5d 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -18,6 +18,7 @@ #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_MP2 "A_MPEG/L2" |