Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'

* commit 'a53551cba86bb67efcb6105fdc337a36c43132bd':
  frame: fix the error path in av_frame_copy_props()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-29 12:34:12 +02:00
commit d9c4f61dab

View File

@ -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);