History

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

James Almer committed 5 years ago

Commit e0b84d11 parent 8b83dad1 file · +5 −14Browse files

Unified · Split

libavfilter/avfilter.c+5−14
@@ -25,8 +25,8 @@ · 24 unmodified lines
2525 #include "libavutil/channel_layout.h"
2626 #include "libavutil/common.h"
2727 #include "libavutil/eval.h"
28+#include "libavutil/frame.h"
2829 #include "libavutil/hwcontext.h"
29−#include "libavutil/imgutils.h"
3030 #include "libavutil/internal.h"
3131 #include "libavutil/opt.h"
3232 #include "libavutil/pixdesc.h"
@@ -1446,19 +1446,10 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) · 1413 unmodified lines
14461446 return ret;
14471447 }
14481448
1449− switch (link->type) {
1450− case AVMEDIA_TYPE_VIDEO:
1451− av_image_copy(out->data, out->linesize, (const uint8_t **)frame->data, frame->linesize,
1452− frame->format, frame->width, frame->height);
1453− break;
1454− case AVMEDIA_TYPE_AUDIO:
1455− av_samples_copy(out->extended_data, frame->extended_data,
1456− 0, 0, frame->nb_samples,
1457− frame->channels,
1458− frame->format);
1459− break;
1460− default:
1461− av_assert0(!"reached");
1449+ ret = av_frame_copy(out, frame);
1450+ if (ret < 0) {
1451+ av_frame_free(&out);
1452+ return ret;
14621453 }
14631454
14641455 av_frame_free(&frame);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t