comparison mxf.c @ 3117:021b8af968cd libavformat

support AVDISCARD_ALL

3116:62255978fe94

            if (index < 0) {
                av_log(s, AV_LOG_ERROR, "error getting stream index\n");
                url_fskip(s->pb, klv.length);
                return -1;
            }
            /* check for 8 channels AES3 element */
            if (klv.key[12] == 0x06 && klv.key[13] == 0x01 && klv.key[14] == 0x10) {
                if (mxf_get_d10_aes3_packet(s->pb, s->streams[index], pkt, klv.length) < 0) {
                    av_log(s, AV_LOG_ERROR, "error reading D-10 aes3 frame\n");
                    return -1;

                av_get_packet(s->pb, pkt, klv.length);
            pkt->stream_index = index;
            pkt->pos = klv.offset;
            return 0;
        } else
            url_fskip(s->pb, klv.length);
    }
    return AVERROR(EIO);
}

3117:021b8af968cd

            if (index < 0) {
                av_log(s, AV_LOG_ERROR, "error getting stream index\n");
                url_fskip(s->pb, klv.length);
                return -1;
            }
            if (s->streams[index]->discard == AVDISCARD_ALL)
                goto skip;
            /* check for 8 channels AES3 element */
            if (klv.key[12] == 0x06 && klv.key[13] == 0x01 && klv.key[14] == 0x10) {
                if (mxf_get_d10_aes3_packet(s->pb, s->streams[index], pkt, klv.length) < 0) {
                    av_log(s, AV_LOG_ERROR, "error reading D-10 aes3 frame\n");
                    return -1;

                av_get_packet(s->pb, pkt, klv.length);
            pkt->stream_index = index;
            pkt->pos = klv.offset;
            return 0;
        } else
        skip:
            url_fskip(s->pb, klv.length);
    }
    return AVERROR(EIO);
}