| Message ID | 201608232105.37833.cehoyos@ag.or.at |
|---|---|
| State | Accepted |
| Commit | c1de1f046997f3449b56fe7480c21498cec9fad7 |
| Headers | show |
On Tue, Aug 23, 2016 at 09:05:37PM +0200, Carl Eugen Hoyos wrote: > Hi! > > Attached patch fixes a warning here, am I misunderstanding the code? > > Please comment, Carl Eugen > movenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > b1ebc046114fef9cb5d3545a5d0bb2207859c6fe 0001-lavf-movenc-Add-a-missing-assignment-if-memory-alloc.patch > From 3b562e7fada0474dee1fcab17c7458344c2c5036 Mon Sep 17 00:00:00 2001 > From: Carl Eugen Hoyos <cehoyos@ag.or.at> > Date: Tue, 23 Aug 2016 21:02:57 +0200 > Subject: [PATCH] lavf/movenc: Add a missing assignment if memory allocation > fails. > > Fixes a warning: > libavformat/movenc.c:5947:17: warning: statement with no effect [-Wunused-value] > --- > libavformat/movenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > index 1f55333..9bf3a04 100644 > --- a/libavformat/movenc.c > +++ b/libavformat/movenc.c > @@ -5944,7 +5944,7 @@ static int mov_write_trailer(AVFormatContext *s) > track->vos_len = par->extradata_size; > track->vos_data = av_malloc(track->vos_len); > if (!track->vos_data) { > - AVERROR(ENOMEM); > + res = AVERROR(ENOMEM); > goto error; LGTM thx [...]
2016-08-23 22:30 GMT+02:00 Michael Niedermayer <michael@niedermayer.cc>: > On Tue, Aug 23, 2016 at 09:05:37PM +0200, Carl Eugen Hoyos wrote: >> track->vos_data = av_malloc(track->vos_len); >> if (!track->vos_data) { >> - AVERROR(ENOMEM); >> + res = AVERROR(ENOMEM); >> goto error; > > LGTM > thx Patch applied. Thank you, Carl Eugen
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 1f55333..9bf3a04 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5944,7 +5944,7 @@ static int mov_write_trailer(AVFormatContext *s) track->vos_len = par->extradata_size; track->vos_data = av_malloc(track->vos_len); if (!track->vos_data) { - AVERROR(ENOMEM); + res = AVERROR(ENOMEM); goto error; } memcpy(track->vos_data, par->extradata, track->vos_len);
Hi! Attached patch fixes a warning here, am I misunderstanding the code? Please comment, Carl Eugen From 3b562e7fada0474dee1fcab17c7458344c2c5036 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos <cehoyos@ag.or.at> Date: Tue, 23 Aug 2016 21:02:57 +0200 Subject: [PATCH] lavf/movenc: Add a missing assignment if memory allocation fails. Fixes a warning: libavformat/movenc.c:5947:17: warning: statement with no effect [-Wunused-value] --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)