virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

tiff: use AVFrame accessor functions

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-01 22:24:22 +01:00
parent e0f716a9d9
commit f232659130
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/tiff.c
View File

@ -289,7 +289,7 @@ static int add_doubles_metadata(int count,
av_freep(&dp); av_freep(&dp);
if (!ap) if (!ap)
return AVERROR(ENOMEM); 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; return 0;
} }
@ -315,7 +315,7 @@ static int add_shorts_metadata(int count, const char *name,
av_freep(&sp); av_freep(&sp);
if (!ap) if (!ap)
return AVERROR(ENOMEM); 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; return 0;
} }
@ -334,7 +334,7 @@ static int add_string_metadata(int count, const char *name,
bytestream2_get_bufferu(&s->gb, value, count); bytestream2_get_bufferu(&s->gb, value, count);
value[count] = 0; 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; return 0;
} }
@ -1075,7 +1075,7 @@ static int decode_frame(AVCodecContext *avctx,
free_geotags(s); free_geotags(s);
/* metadata has been destroyed from lavc internals, that pointer is not /* metadata has been destroyed from lavc internals, that pointer is not
* valid anymore */ * 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 // As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number
// that further identifies the file as a TIFF file" // 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); av_log(avctx, AV_LOG_WARNING, "Type of GeoTIFF key %d is wrong\n", s->geotags[i].key);
continue; 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) { if (ret<0) {
av_log(avctx, AV_LOG_ERROR, "Writing metadata with key '%s' failed\n", keyname); av_log(avctx, AV_LOG_ERROR, "Writing metadata with key '%s' failed\n", keyname);
return ret; return ret;