From f23265913029fac38fc0f53d4cd2b7bb12507a38 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 1 Mar 2013 22:24:22 +0100 Subject: tiff: use AVFrame accessor functions Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 77706c0cda..b43fda8c63 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -289,7 +289,7 @@ static int add_doubles_metadata(int count, av_freep(&dp); if (!ap) return AVERROR(ENOMEM); - av_dict_set(&s->picture.metadata, name, ap, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(ff_frame_get_metadatap(&s->picture), name, ap, AV_DICT_DONT_STRDUP_VAL); return 0; } @@ -315,7 +315,7 @@ static int add_shorts_metadata(int count, const char *name, av_freep(&sp); if (!ap) return AVERROR(ENOMEM); - av_dict_set(&s->picture.metadata, name, ap, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(ff_frame_get_metadatap(&s->picture), name, ap, AV_DICT_DONT_STRDUP_VAL); return 0; } @@ -334,7 +334,7 @@ static int add_string_metadata(int count, const char *name, bytestream2_get_bufferu(&s->gb, value, count); value[count] = 0; - av_dict_set(&s->picture.metadata, name, value, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(ff_frame_get_metadatap(&s->picture), name, value, AV_DICT_DONT_STRDUP_VAL); return 0; } @@ -1075,7 +1075,7 @@ static int decode_frame(AVCodecContext *avctx, free_geotags(s); /* metadata has been destroyed from lavc internals, that pointer is not * valid anymore */ - s->picture.metadata = NULL; + av_frame_set_metadata(&s->picture, NULL); // As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number // that further identifies the file as a TIFF file" @@ -1111,7 +1111,7 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_WARNING, "Type of GeoTIFF key %d is wrong\n", s->geotags[i].key); continue; } - ret = av_dict_set(&s->picture.metadata, keyname, s->geotags[i].val, 0); + ret = av_dict_set(ff_frame_get_metadatap(&s->picture), keyname, s->geotags[i].val, 0); if (ret<0) { av_log(avctx, AV_LOG_ERROR, "Writing metadata with key '%s' failed\n", keyname); return ret; -- cgit v1.2.3