comparison matroska.c @ 1475:a83e86c05295 libavformat

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

1474:70ed1bf0ae45

    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U16LE},
//    {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE},
    {"A_AC3"            , CODEC_ID_AC3},
    {"A_DTS"            , CODEC_ID_DTS},
    {"A_VORBIS"         , CODEC_ID_VORBIS},
    {"A_AAC/"           , CODEC_ID_AAC},
    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
    {NULL               , CODEC_ID_NONE}
/* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
};

                tag = (p[1] << 8) | p[0];
                codec_id = codec_get_wav_id(tag);

            }

            if (codec_id==CODEC_ID_AAC) {
                MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track;
                int profile = matroska_aac_profile(track->codec_id);
                int sri = matroska_aac_sri(audiotrack->internal_samplerate);
                extradata = av_malloc(5);
                if (extradata == NULL)

1475:a83e86c05295

    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U16LE},
//    {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE},
    {"A_AC3"            , CODEC_ID_AC3},
    {"A_DTS"            , CODEC_ID_DTS},
    {"A_VORBIS"         , CODEC_ID_VORBIS},
    {"A_AAC"            , CODEC_ID_AAC},
    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
    {NULL               , CODEC_ID_NONE}
/* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
};

                tag = (p[1] << 8) | p[0];
                codec_id = codec_get_wav_id(tag);

            }

            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);
                extradata = av_malloc(5);
                if (extradata == NULL)