From: Steve Lhomme <robux@videolan.org>
Date: Sat, 22 Oct 2005 13:12:25 +0000 (+0000)
Subject: mkv.cpp: add support for the basic A_AAC codec ID
X-Git-Tag: 0.8.4~192
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=76f6417bec5548faddf32feadf3c2e120341da01;p=vlc

mkv.cpp: add support for the basic A_AAC codec ID
---

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 7867d4b97b..a541320350 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -2357,6 +2357,12 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
             ((uint8_t*)tracks[i_track]->fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1);
             ((uint8_t*)tracks[i_track]->fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tracks[i_track]->fmt.audio.i_channels << 3);
         }
+        else if( !strcmp( tracks[i_track]->psz_codec, "A_AAC" ) )
+        {
+            tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
+            tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data;
+            tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data );
+        }
         else if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) ||
                  !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/LIT" ) ||
                  !strcmp( tracks[i_track]->psz_codec, "A_PCM/FLOAT/IEEE" ) )