Mercurial > libavformat.hg

changeset 1475:a83e86c05295 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add A_AAC codec identifier support in matroska. Patch by Steve Lhomme % slhomme A divxcorp P com % Original thread: Date: Fri, 10 Nov 2006 15:22:33 +0100 Subject: [Ffmpeg-devel] [PATCH] Handle "A_AAC" in matroska codec IDs
author aurel
date Sat, 11 Nov 2006 00:49:39 +0000
parents 70ed1bf0ae45
children a30bd44f52e2
files matroska.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/matroska.c	Sat Nov 11 00:29:49 2006 +0000
+++ b/matroska.c	Sat Nov 11 00:49:39 2006 +0000
@@ -222,7 +222,7 @@
     {"A_AC3"            , CODEC_ID_AC3},
     {"A_DTS"            , CODEC_ID_DTS},
     {"A_VORBIS"         , CODEC_ID_VORBIS},
-    {"A_AAC/"           , CODEC_ID_AAC},
+    {"A_AAC"            , CODEC_ID_AAC},
     {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
     {NULL               , CODEC_ID_NONE}
 /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
@@ -2245,7 +2245,7 @@
 
             }
 
-            if (codec_id==CODEC_ID_AAC) {
+            else if (codec_id == CODEC_ID_AAC && !track->codec_priv_size) {
                 MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track;
                 int profile = matroska_aac_profile(track->codec_id);
                 int sri = matroska_aac_sri(audiotrack->internal_samplerate);