| Message ID | 20200117101302.2077-1-ffmpeg@gyani.pro |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel] avfilter/f_metadata: correct check for existing metadata | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
OK if tested and works. On 1/17/20, Gyan Doshi <ffmpeg@gyani.pro> wrote: > When adding metadata, existing dictionary need not be present. > --- > libavfilter/f_metadata.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c > index bf298e9d39..598257b15b 100644 > --- a/libavfilter/f_metadata.c > +++ b/libavfilter/f_metadata.c > @@ -304,7 +304,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame > *frame) > AVDictionary **metadata = &frame->metadata; > AVDictionaryEntry *e; > > - if (!*metadata) > + if (!*metadata && s->mode != METADATA_ADD) > return ff_filter_frame(outlink, frame); > > e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, > -- > 2.24.1 > > _______________________________________________ > 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".
On 17-01-2020 03:52 pm, Paul B Mahol wrote: > OK if tested and works. Tested. Pushed as c95dfe5cce98cde3e7fb14fbd04b3897f3927cec Thanks, Gyan > > On 1/17/20, Gyan Doshi <ffmpeg@gyani.pro> wrote: >> When adding metadata, existing dictionary need not be present. >> --- >> libavfilter/f_metadata.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c >> index bf298e9d39..598257b15b 100644 >> --- a/libavfilter/f_metadata.c >> +++ b/libavfilter/f_metadata.c >> @@ -304,7 +304,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame >> *frame) >> AVDictionary **metadata = &frame->metadata; >> AVDictionaryEntry *e; >> >> - if (!*metadata) >> + if (!*metadata && s->mode != METADATA_ADD) >> return ff_filter_frame(outlink, frame); >> >> e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, >> -- >> 2.24.1 >> >> _______________________________________________ >> 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". > _______________________________________________ > 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/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index bf298e9d39..598257b15b 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -304,7 +304,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVDictionary **metadata = &frame->metadata; AVDictionaryEntry *e; - if (!*metadata) + if (!*metadata && s->mode != METADATA_ADD) return ff_filter_frame(outlink, frame); e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL,