ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Apr 1 18:11:48 2015 +0200| [5b911f1d5be45dd125ea48f0e9ff0cdeacba4dac] | committer: Michael Niedermayer
avformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b911f1d5be45dd125ea48f0e9ff0cdeacba4dac --- libavformat/webmdashenc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 4536b7d..b54a1d2 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -271,7 +271,8 @@ static int to_integer(char *p, int len) { int ret; char *q = av_malloc(sizeof(char) * len); - if (!q) return -1; + if (!q) + return AVERROR(ENOMEM); av_strlcpy(q, p, len); ret = atoi(q); av_free(q); @@ -291,7 +292,8 @@ static int parse_adaptation_sets(AVFormatContext *s) continue; else if (state == new_set && !strncmp(p, "id=", 3)) { w->as = av_realloc(w->as, sizeof(*w->as) * ++w->nb_as); - if (w->as == NULL) return -1; + if (w->as == NULL) + return AVERROR(ENOMEM); w->as[w->nb_as - 1].nb_streams = 0; w->as[w->nb_as - 1].streams = NULL; p += 3; // consume "id=" @@ -308,7 +310,8 @@ static int parse_adaptation_sets(AVFormatContext *s) q = p; while (*q != '\0' && *q != ',' && *q != ' ') q++; as->streams = av_realloc(as->streams, sizeof(*as->streams) * ++as->nb_streams); - if (as->streams == NULL) return -1; + if (as->streams == NULL) + return AVERROR(ENOMEM); as->streams[as->nb_streams - 1] = to_integer(p, q - p + 1); if (as->streams[as->nb_streams - 1] < 0) return -1; if (*q == '\0') break; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
