comparison utils.c @ 3330:374e74567a4e libavformat

Make ff_new_chapter() return AVChapter instead of int so its consistant with av_new_program() and its simpler to set other fields in AVChapter which arent set by ff_new_chapter().

3329:8426e474011f

        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->nb_chapters; i++)

            chapter = s->chapters[i];

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

    return 0;
}

/************************************************************/
/* output media file */

3330:374e74567a4e

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

AVChapter *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->nb_chapters; i++)

            chapter = s->chapters[i];

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

    return chapter;
}

/************************************************************/
/* output media file */