diff options
| author | James Almer <jamrial@gmail.com> | 2016-02-20 21:44:53 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-02-21 14:31:19 -0300 |
| commit | 778439b69a63f48278b550937a87704b1d92e359 (patch) | |
| tree | 15ad966b5f5bcb93322bf054350ee2edb8b40620 | |
| parent | dc0481f2fbae4d5942ccabf2061900da3ee85f30 (diff) | |
| download | ffmpeg-778439b69a63f48278b550937a87704b1d92e359.tar.gz | |
avcodec/webp: move exif_metadata outside of WebPContext
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/webp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 5c2961ff19..81b2e91211 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -196,7 +196,6 @@ typedef struct WebPContext { uint8_t *alpha_data; /* alpha chunk data */ int alpha_data_size; /* alpha chunk data size */ int has_exif; /* set after an EXIF chunk has been processed */ - AVDictionary *exif_metadata; /* EXIF chunk data */ int width; /* image width */ int height; /* image height */ int lossless; /* indicates lossless or lossy */ @@ -1386,7 +1385,6 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_INVALIDDATA; } - av_dict_free(&s->exif_metadata); while (bytestream2_get_bytes_left(&gb) > 8) { char chunk_str[5] = { 0 }; @@ -1463,6 +1461,7 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } case MKTAG('E', 'X', 'I', 'F'): { int le, ifd_offset, exif_offset = bytestream2_tell(&gb); + AVDictionary *exif_metadata = NULL; GetByteContext exif_gb; if (s->has_exif) { @@ -1484,15 +1483,15 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } bytestream2_seek(&exif_gb, ifd_offset, SEEK_SET); - if (avpriv_exif_decode_ifd(avctx, &exif_gb, le, 0, &s->exif_metadata) < 0) { + if (avpriv_exif_decode_ifd(avctx, &exif_gb, le, 0, &exif_metadata) < 0) { av_log(avctx, AV_LOG_ERROR, "error decoding Exif data\n"); goto exif_end; } - av_dict_copy(avpriv_frame_get_metadatap(data), s->exif_metadata, 0); + av_dict_copy(avpriv_frame_get_metadatap(data), exif_metadata, 0); exif_end: - av_dict_free(&s->exif_metadata); + av_dict_free(&exif_metadata); bytestream2_skip(&gb, chunk_size); break; } |