ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test for ctx->sw_pix_fmt being AV_PIX_FMT_NONE before trying to do do hwdevice transfer

pull/3468/head
Isaac Connor 2022-04-18 18:06:05 -04:00
parent f8366864b5
commit 4154731f13
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_packet.cpp
View File

@ -130,10 +130,13 @@ int ZMPacket::decode(AVCodecContext *ctx) {
#if HAVE_LIBAVUTIL_HWCONTEXT_H
#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
if (fix_deprecated_pix_fmt(ctx->sw_pix_fmt) != fix_deprecated_pix_fmt(static_cast<AVPixelFormat>(in_frame->format))) {
Debug(3, "Have different format ctx->pix_fmt %s ?= ctx->sw_pix_fmt %s in_frame->format %s.",
if ((ctx->sw_pix_fmt != AV_PIX_FMT_NONE) and (fix_deprecated_pix_fmt(ctx->sw_pix_fmt) != fix_deprecated_pix_fmt(static_cast<AVPixelFormat>(in_frame->format)))) {
Debug(3, "Have different format ctx->pix_fmt %d %s ?= ctx->sw_pix_fmt %d %s in_frame->format %d %s.",
ctx->pix_fmt,
av_get_pix_fmt_name(ctx->pix_fmt),
ctx->sw_pix_fmt,
av_get_pix_fmt_name(ctx->sw_pix_fmt),
in_frame->format,
av_get_pix_fmt_name(static_cast<AVPixelFormat>(in_frame->format))
);
#if 0