repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.1~trusty
[deb_ffmpeg.git]
/
ffmpeg
/
libavutil
/
frame.c
diff --git
a/ffmpeg/libavutil/frame.c
b/ffmpeg/libavutil/frame.c
index 4ee06306ce25ae9880f3fe24eea0b95043c82d1d..5c9aa2914ccef81a9a75b6d04ad2c1da560ccad7 100644
(file)
--- a/
ffmpeg/libavutil/frame.c
+++ b/
ffmpeg/libavutil/frame.c
@@
-503,6
+503,7
@@
int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
free_side_data(&dst->side_data[i]);
}
av_freep(&dst->side_data);
free_side_data(&dst->side_data[i]);
}
av_freep(&dst->side_data);
+ dst->nb_side_data = 0;
return AVERROR(ENOMEM);
}
memcpy(sd_dst->data, sd_src->data, sd_src->size);
return AVERROR(ENOMEM);
}
memcpy(sd_dst->data, sd_src->data, sd_src->size);