diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 12:34:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 12:35:02 +0200 |
| commit | d9c4f61dab2a1994ae3220080583baab37cf2372 (patch) | |
| tree | 39c36c37c965e8261624f77fc77819ae7c05768e /libavutil | |
| parent | 78a79a2ceb63e0fff84de978f1373810ee1bc5d7 (diff) | |
| parent | a53551cba86bb67efcb6105fdc337a36c43132bd (diff) | |
| download | ffmpeg-d9c4f61dab2a1994ae3220080583baab37cf2372.tar.gz | |
Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'
* commit 'a53551cba86bb67efcb6105fdc337a36c43132bd':
frame: fix the error path in av_frame_copy_props()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 9617b10cc5..85208b8644 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -483,8 +483,8 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) if (!sd_dst) { for (i = 0; i < dst->nb_side_data; i++) { av_freep(&dst->side_data[i]->data); - av_freep(&dst->side_data[i]); av_dict_free(&dst->side_data[i]->metadata); + av_freep(&dst->side_data[i]); } av_freep(&dst->side_data); return AVERROR(ENOMEM); |