virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

avformat/img2dec: Avoid duplicating buffer when adding side-data

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-05-23 13:02:54 +02:00
parent be22f97332
commit 9fee37c56e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/img2dec.c
View File

@@ -379,8 +379,7 @@ int ff_img_read_header(AVFormatContext *s1)
* as a dictionary, so it can be used by filters like 'drawtext'. * as a dictionary, so it can be used by filters like 'drawtext'.
*/ */
static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) { static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) {
uint8_t* metadata; int metadata_len, ret;
int metadata_len;
AVDictionary *d = NULL; AVDictionary *d = NULL;
char *packed_metadata = NULL; char *packed_metadata = NULL;
@@ -391,13 +390,12 @@ static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) {
av_dict_free(&d); av_dict_free(&d);
if (!packed_metadata) if (!packed_metadata)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (!(metadata = av_packet_new_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, metadata_len))) { ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA,
packed_metadata, metadata_len);
if (ret < 0) {
av_freep(&packed_metadata); av_freep(&packed_metadata);
return AVERROR(ENOMEM); return ret;
} }
memcpy(metadata, packed_metadata, metadata_len);
av_freep(&packed_metadata);
return 0; return 0;
} }