diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 23:18:45 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 23:33:26 +0400 |
commit | c4e8821732999f720535bb2eb1e8c7f1ea1db18f (patch) | |
tree | 12b31863b7145b0342207aafd0ffa256da2904b9 /libavcodec/tiff.c | |
parent | fee484edaff77fc831d4cbbdd259ea0948103f86 (diff) | |
parent | 7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e (diff) |
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
Move AVFrame from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b43fda8c63..43d12db14a 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(ff_frame_get_metadatap(&s->picture), name, ap, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(avpriv_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(ff_frame_get_metadatap(&s->picture), name, ap, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(avpriv_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(ff_frame_get_metadatap(&s->picture), name, value, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(avpriv_frame_get_metadatap(&s->picture), name, value, AV_DICT_DONT_STRDUP_VAL); return 0; } @@ -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(ff_frame_get_metadatap(&s->picture), keyname, s->geotags[i].val, 0); + ret = av_dict_set(avpriv_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; |