Message ID | 1587894562-30207-4-git-send-email-lance.lmwang@gmail.com |
---|---|
State | Accepted |
Commit | a9029703bb1a8272fa7e2fd33393c273e5ad7ff6 |
Headers | show |
Series | [FFmpeg-devel,v1,1/6] fftools/ffmpeg: use local variable with same contents directly | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
On 4/26/20 3:19 PM, lance.lmwang@gmail.com wrote: > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavformat/dashenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c > index 96c0ea3..e3e187c 100644 > --- a/libavformat/dashenc.c > +++ b/libavformat/dashenc.c > @@ -1731,7 +1731,7 @@ static int add_segment(OutputStream *os, const char *file, > Segment *seg; > if (os->nb_segments >= os->segments_size) { > os->segments_size = (os->segments_size + 1) * 2; > - if ((err = av_reallocp(&os->segments, sizeof(*os->segments) * > + if ((err = av_reallocp_array(&os->segments, sizeof(*os->segments), > os->segments_size)) < 0) { > os->segments_size = 0; > os->nb_segments = 0; LGTM
On 4/26/20 5:34 PM, Jeyapal, Karthick wrote: > > On 4/26/20 3:19 PM, lance.lmwang@gmail.com wrote: >> From: Limin Wang <lance.lmwang@gmail.com> >> >> Signed-off-by: Limin Wang <lance.lmwang@gmail.com> >> --- >> libavformat/dashenc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c >> index 96c0ea3..e3e187c 100644 >> --- a/libavformat/dashenc.c >> +++ b/libavformat/dashenc.c >> @@ -1731,7 +1731,7 @@ static int add_segment(OutputStream *os, const char *file, >> Segment *seg; >> if (os->nb_segments >= os->segments_size) { >> os->segments_size = (os->segments_size + 1) * 2; >> - if ((err = av_reallocp(&os->segments, sizeof(*os->segments) * >> + if ((err = av_reallocp_array(&os->segments, sizeof(*os->segments), >> os->segments_size)) < 0) { >> os->segments_size = 0; >> os->nb_segments = 0; > LGTM Pushed all three dashenc patches from this patchset. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 96c0ea3..e3e187c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1731,7 +1731,7 @@ static int add_segment(OutputStream *os, const char *file, Segment *seg; if (os->nb_segments >= os->segments_size) { os->segments_size = (os->segments_size + 1) * 2; - if ((err = av_reallocp(&os->segments, sizeof(*os->segments) * + if ((err = av_reallocp_array(&os->segments, sizeof(*os->segments), os->segments_size)) < 0) { os->segments_size = 0; os->nb_segments = 0;