From patchwork Sat Oct 1 12:53:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 802 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp722486vsd; Sat, 1 Oct 2016 05:54:20 -0700 (PDT) X-Received: by 10.28.41.131 with SMTP id p125mr2197097wmp.15.1475326460763; Sat, 01 Oct 2016 05:54:20 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ip5si26033653wjb.281.2016.10.01.05.54.20; Sat, 01 Oct 2016 05:54:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8CC5B68A063; Sat, 1 Oct 2016 15:54:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A26868A05E for ; Sat, 1 Oct 2016 15:53:58 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 503771017B9; Sat, 1 Oct 2016 14:54:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id maTjPihXjEOZ; Sat, 1 Oct 2016 14:54:10 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B8EED1017A4; Sat, 1 Oct 2016 14:54:09 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Oct 2016 14:53:55 +0200 Message-Id: <1475326436-17647-1-git-send-email-cus@passwd.hu> X-Mailer: git-send-email 2.6.6 Subject: [FFmpeg-devel] [PATCH 1/2] lavfi/metadata: fix setting metadata values X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavfilter/f_metadata.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 188f0b6..1fe713c 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -280,13 +280,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; MetadataContext *s = ctx->priv; - AVDictionary *metadata = av_frame_get_metadata(frame); + AVDictionary **metadata = avpriv_frame_get_metadatap(frame); AVDictionaryEntry *e; - if (!metadata) + if (!*metadata) return ff_filter_frame(outlink, frame); - e = av_dict_get(metadata, !s->key ? "" : s->key, NULL, + e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, !s->key ? AV_DICT_IGNORE_SUFFIX: 0); switch (s->mode) { @@ -302,13 +302,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) if (e && e->value) { ; } else { - av_dict_set(&metadata, s->key, s->value, 0); + av_dict_set(metadata, s->key, s->value, 0); } return ff_filter_frame(outlink, frame); break; case METADATA_MODIFY: if (e && e->value) { - av_dict_set(&metadata, s->key, s->value, 0); + av_dict_set(metadata, s->key, s->value, 0); } return ff_filter_frame(outlink, frame); break; @@ -317,7 +317,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n", inlink->frame_count, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); s->print(ctx, "%s=%s\n", e->key, e->value); - while ((e = av_dict_get(metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) { + while ((e = av_dict_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) { s->print(ctx, "%s=%s\n", e->key, e->value); } } else if (e && e->value && (!s->value || (e->value && s->compare(s, e->value, s->value)))) { @@ -329,9 +329,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) break; case METADATA_DELETE: if (e && e->value && s->value && s->compare(s, e->value, s->value)) { - av_dict_set(&metadata, s->key, NULL, 0); + av_dict_set(metadata, s->key, NULL, 0); } else if (e && e->value) { - av_dict_set(&metadata, s->key, NULL, 0); + av_dict_set(metadata, s->key, NULL, 0); } return ff_filter_frame(outlink, frame); break;