RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-05 14:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'

Browse Source 
* commit '44671b57866aab8dd36715ff010e985e25baaf19':
  AVFrame: factor out freeing the side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-18 12:53:35 +02:00
commit 40c9d43086
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavutil/frame.c
View File

@ -113,6 +113,15 @@ static void get_frame_defaults(AVFrame *frame)
#endif #endif
} }
static void free_side_data(AVFrameSideData **ptr_sd)
{
AVFrameSideData *sd = *ptr_sd;
av_freep(&sd->data);
av_dict_free(&sd->metadata);
av_freep(ptr_sd);
}
AVFrame *av_frame_alloc(void) AVFrame *av_frame_alloc(void)
{ {
AVFrame *frame = av_mallocz(sizeof(*frame)); AVFrame *frame = av_mallocz(sizeof(*frame));
@ -360,9 +369,7 @@ void av_frame_unref(AVFrame *frame)
int i; int i;
for (i = 0; i < frame->nb_side_data; i++) { for (i = 0; i < frame->nb_side_data; i++) {
av_freep(&frame->side_data[i]->data); free_side_data(&frame->side_data[i]);
av_dict_free(&frame->side_data[i]->metadata);
av_freep(&frame->side_data[i]);
} }
av_freep(&frame->side_data); av_freep(&frame->side_data);
@ -493,9 +500,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
sd_src->size); sd_src->size);
if (!sd_dst) { if (!sd_dst) {
for (i = 0; i < dst->nb_side_data; i++) { for (i = 0; i < dst->nb_side_data; i++) {
av_freep(&dst->side_data[i]->data); free_side_data(&dst->side_data[i]);
av_dict_free(&dst->side_data[i]->metadata);
av_freep(&dst->side_data[i]);
} }
av_freep(&dst->side_data); av_freep(&dst->side_data);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -661,9 +666,7 @@ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type)
for (i = 0; i < frame->nb_side_data; i++) { for (i = 0; i < frame->nb_side_data; i++) {
AVFrameSideData *sd = frame->side_data[i]; AVFrameSideData *sd = frame->side_data[i];
if (sd->type == type) { if (sd->type == type) {
av_freep(&sd->data); free_side_data(&frame->side_data[i]);
av_dict_free(&sd->metadata);
av_freep(&frame->side_data[i]);
frame->side_data[i] = frame->side_data[frame->nb_side_data - 1]; frame->side_data[i] = frame->side_data[frame->nb_side_data - 1];
frame->nb_side_data--; frame->nb_side_data--;
} }