diff options
| author | Muhammad Faiz <mfcc64@gmail.com> | 2017-04-22 15:54:58 +0700 |
|---|---|---|
| committer | Muhammad Faiz <mfcc64@gmail.com> | 2017-04-23 14:27:47 +0700 |
| commit | 31f61b0d4f8d452becb44f044c739f9057900159 (patch) | |
| tree | 624d61d8db11c10d9f01aabaf649aa1f45a497d3 /libavcodec/tiff.c | |
| parent | fdeab95a823b10adda6f29d134122537c21578e2 (diff) | |
| download | ffmpeg-31f61b0d4f8d452becb44f044c739f9057900159.tar.gz | |
avcodec: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index cb1a34e73a..c8e24e33cc 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -227,9 +227,9 @@ static int add_metadata(int count, int type, const char *name, const char *sep, TiffContext *s, AVFrame *frame) { switch(type) { - case TIFF_DOUBLE: return ff_tadd_doubles_metadata(count, name, sep, &s->gb, s->le, avpriv_frame_get_metadatap(frame)); - case TIFF_SHORT : return ff_tadd_shorts_metadata(count, name, sep, &s->gb, s->le, 0, avpriv_frame_get_metadatap(frame)); - case TIFF_STRING: return ff_tadd_string_metadata(count, name, &s->gb, s->le, avpriv_frame_get_metadatap(frame)); + case TIFF_DOUBLE: return ff_tadd_doubles_metadata(count, name, sep, &s->gb, s->le, &frame->metadata); + case TIFF_SHORT : return ff_tadd_shorts_metadata(count, name, sep, &s->gb, s->le, 0, &frame->metadata); + case TIFF_STRING: return ff_tadd_string_metadata(count, name, &s->gb, s->le, &frame->metadata); default : return AVERROR_INVALIDDATA; }; } @@ -1255,7 +1255,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(avpriv_frame_get_metadatap(p), keyname, s->geotags[i].val, 0); + ret = av_dict_set(&p->metadata, 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; |