RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/buffersrc: validate hw context presence in video_init() 

That is the more appropriate place for it than query_formats().
This commit is contained in:
Anton Khirnov 2024-09-25 11:24:52 +02:00
parent 2fa142f7c0
commit a7fe27f964
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/buffersrc.c
View File

@ -291,6 +291,13 @@ static av_cold int init_video(AVFilterContext *ctx)
av_log(ctx, AV_LOG_ERROR, "Unspecified pixel format\n"); av_log(ctx, AV_LOG_ERROR, "Unspecified pixel format\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (av_pix_fmt_desc_get(c->pix_fmt)->flags & AV_PIX_FMT_FLAG_HWACCEL) {
if (!c->hw_frames_ctx) {
av_log(ctx, AV_LOG_ERROR, "Setting BufferSourceContext.pix_fmt "
"to a HW format requires hw_frames_ctx to be non-NULL!\n");
return AVERROR(EINVAL);
}
}
if (c->w <= 0 || c->h <= 0) { if (c->w <= 0 || c->h <= 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid size %dx%d\n", c->w, c->h); av_log(ctx, AV_LOG_ERROR, "Invalid size %dx%d\n", c->w, c->h);
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -445,14 +452,8 @@ static int query_formats(AVFilterContext *ctx)
switch (ctx->outputs[0]->type) { switch (ctx->outputs[0]->type) {
case AVMEDIA_TYPE_VIDEO: { case AVMEDIA_TYPE_VIDEO: {
enum AVPixelFormat swfmt = c->pix_fmt; enum AVPixelFormat swfmt = c->pix_fmt;
if (av_pix_fmt_desc_get(swfmt)->flags & AV_PIX_FMT_FLAG_HWACCEL) { if (av_pix_fmt_desc_get(swfmt)->flags & AV_PIX_FMT_FLAG_HWACCEL)
if (!c->hw_frames_ctx) {
av_log(ctx, AV_LOG_ERROR, "Setting BufferSourceContext.pix_fmt "
"to a HW format requires hw_frames_ctx to be non-NULL!\n");
return AVERROR(EINVAL);
}
swfmt = ((AVHWFramesContext *) c->hw_frames_ctx->data)->sw_format; swfmt = ((AVHWFramesContext *) c->hw_frames_ctx->data)->sw_format;
}
if ((ret = ff_add_format (&formats, c->pix_fmt)) < 0 || if ((ret = ff_add_format (&formats, c->pix_fmt)) < 0 ||
(ret = ff_set_common_formats (ctx , formats )) < 0) (ret = ff_set_common_formats (ctx , formats )) < 0)
return ret; return ret;