Revision 1e79771c

View differences:

libavcodec/mpeg4audio.c
88 88
    if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
89 89
        c->channels = ff_mpeg4audio_channels[c->chan_config];
90 90
    c->sbr = -1;
91
    if (c->object_type == AOT_SBR) {
91
    if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&
92
        // check for W6132 Annex YYYY draft MP3onMP4
93
        !(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) {
92 94
        c->ext_object_type = c->object_type;
93 95
        c->sbr = 1;
94 96
        c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);

Also available in: Unified diff