highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/avfilter: use av_frame_copy() to copy frame data

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-08-02 09:55:27 -03:00
parent 8b83dad825
commit e0b84d1069
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/avfilter.c
View File

@ -25,8 +25,8 @@
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/frame.h"
#include "libavutil/hwcontext.h" #include "libavutil/hwcontext.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
@ -1446,19 +1446,10 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe)
return ret; return ret;
} }
switch (link->type) { ret = av_frame_copy(out, frame);
case AVMEDIA_TYPE_VIDEO: if (ret < 0) {
av_image_copy(out->data, out->linesize, (const uint8_t **)frame->data, frame->linesize, av_frame_free(&out);
frame->format, frame->width, frame->height); return ret;
break;
case AVMEDIA_TYPE_AUDIO:
av_samples_copy(out->extended_data, frame->extended_data,
0, 0, frame->nb_samples,
frame->channels,
frame->format);
break;
default:
av_assert0(!"reached");
} }
av_frame_free(&frame); av_frame_free(&frame);