comparison utils.c @ 3323:4bf98e198eec libavformat

Add id to AVChapter, untested (where do i find matroska files with chapters?).

3322:97f7b77a969b

        program->provider_name = av_strdup(provider_name);
        program->         name = av_strdup(         name);
    }
}

int ff_new_chapter(AVFormatContext *s, int64_t start, int64_t end, const char *title)
{
    AVChapter *chapter = av_mallocz(sizeof(AVChapter));
    if(!chapter)
        return AVERROR(ENOMEM);
    if (title)
        chapter->title = av_strdup(title);
    chapter->start = start;
    chapter->end = end;

    dynarray_add(&s->chapters, &s->num_chapters, chapter);

    return 0;
}

/************************************************************/

3323:4bf98e198eec

        program->provider_name = av_strdup(provider_name);
        program->         name = av_strdup(         name);
    }
}

int ff_new_chapter(AVFormatContext *s, int id, int64_t start, int64_t end, const char *title)
{
    AVChapter *chapter = NULL;
    int i;

    for(i=0; i<s->num_chapters; i++)
        if(s->chapters[i]->id == id)
            chapter = s->chapters[i];

    if(!chapter){
        chapter= av_mallocz(sizeof(AVChapter));
    if(!chapter)
        return AVERROR(ENOMEM);
        dynarray_add(&s->chapters, &s->num_chapters, chapter);
    }
    if(chapter->title)
        av_free(chapter->title);
    if (title)
        chapter->title = av_strdup(title);
    chapter->id    = id;
    chapter->start = start;
    chapter->end = end;

    return 0;
}

/************************************************************/