RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_stack: Don't modify const strings 

b3b7ba62 introduced undefined behaviour: A (non-modifiable) string
literal has been assigned to a modifiable string; said string was indeed
modified later via av_strtok.
This of course caused compiler warnings because of the discarded
qualifier; these are in particular fixed by this commit.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-05-14 06:15:17 +02:00 committed by Paul B Mahol
parent 8ef163ba9e
commit 670251de56
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_stack.c
View File

@ -84,9 +84,11 @@ static av_cold int init(AVFilterContext *ctx)
if (!strcmp(ctx->filter->name, "xstack")) {
if (!s->layout) {
if (s->nb_inputs == 2)
s->layout = "0_0|w0_0";
else {
if (s->nb_inputs == 2) {
s->layout = av_strdup("0_0|w0_0");
if (!s->layout)
return AVERROR(ENOMEM);
} else {
av_log(ctx, AV_LOG_ERROR, "No layout specified.\n");
return AVERROR(EINVAL);
}