comparison matroskadec.c @ 2201:c514ebfeec49 libavformat

drop blocks which are part of unsupported tracks

2200:5894ebb2faa7

    /* Unique track number and track ID. stream_index is the index that
     * the calling app uses for this track. */
    uint32_t num;
    uint32_t uid;
    uint32_t stream_index;

    char *name;
    char *language;

    char *codec_id;

            enum CodecID codec_id = CODEC_ID_NONE;
            uint8_t *extradata = NULL;
            int extradata_size = 0;
            int extradata_offset = 0;
            track = matroska->tracks[i];

            /* libavformat does not really support subtitles.
             * Also apply some sanity checks. */
            if ((track->type == MATROSKA_TRACK_TYPE_SUBTITLE) ||
                (track->codec_id == NULL))

        int i, track, stream;
        for (i=0; i<matroska->num_indexes; i++) {
            MatroskaDemuxIndex *idx = &matroska->index[i];
            track = matroska_find_track_by_num(matroska, idx->track);
            stream = matroska->tracks[track]->stream_index;
            av_add_index_entry(matroska->ctx->streams[stream],
                               idx->pos, idx->time/matroska->time_scale,
                               0, 0, AVINDEX_KEYFRAME);
        }
    }

        av_log(matroska->ctx, AV_LOG_INFO,
               "Invalid stream %d or size %u\n", track, size);
        av_free(origdata);
        return res;
    }
    st = matroska->ctx->streams[matroska->tracks[track]->stream_index];
    if (st->discard >= AVDISCARD_ALL) {
        av_free(origdata);
        return res;
    }

2201:c514ebfeec49

    /* Unique track number and track ID. stream_index is the index that
     * the calling app uses for this track. */
    uint32_t num;
    uint32_t uid;
    int stream_index;

    char *name;
    char *language;

    char *codec_id;

            enum CodecID codec_id = CODEC_ID_NONE;
            uint8_t *extradata = NULL;
            int extradata_size = 0;
            int extradata_offset = 0;
            track = matroska->tracks[i];
            track->stream_index = -1;

            /* libavformat does not really support subtitles.
             * Also apply some sanity checks. */
            if ((track->type == MATROSKA_TRACK_TYPE_SUBTITLE) ||
                (track->codec_id == NULL))

        int i, track, stream;
        for (i=0; i<matroska->num_indexes; i++) {
            MatroskaDemuxIndex *idx = &matroska->index[i];
            track = matroska_find_track_by_num(matroska, idx->track);
            stream = matroska->tracks[track]->stream_index;
            if (stream >= 0)
            av_add_index_entry(matroska->ctx->streams[stream],
                               idx->pos, idx->time/matroska->time_scale,
                               0, 0, AVINDEX_KEYFRAME);
        }
    }

        av_log(matroska->ctx, AV_LOG_INFO,
               "Invalid stream %d or size %u\n", track, size);
        av_free(origdata);
        return res;
    }
    if (matroska->tracks[track]->stream_index < 0)
        return res;
    st = matroska->ctx->streams[matroska->tracks[track]->stream_index];
    if (st->discard >= AVDISCARD_ALL) {
        av_free(origdata);
        return res;
    }