Simplify fix for RAWVIDEO handling for ffmpeg 4+

This commit is contained in:
eisneinechse
2020-03-01 17:10:39 -08:00
parent ddd52460e1
commit 6476f930bb

View File

@@ -1995,8 +1995,7 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr<Frame> frame, AVFrame *fra
#if (LIBAVFORMAT_VERSION_MAJOR >= 58)
ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::write_video_packet", "frame->number", frame->number, "oc->oformat->flags", oc->oformat->flags);
if (video_st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
video_st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO) {
if (AV_GET_CODEC_TYPE(video_st) == AVMEDIA_TYPE_VIDEO && AV_FIND_DECODER_CODEC_ID(video_st) == AV_CODEC_ID_RAWVIDEO) {
#else
ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::write_video_packet", "frame->number", frame->number, "oc->oformat->flags & AVFMT_RAWPICTURE", oc->oformat->flags & AVFMT_RAWPICTURE);