* [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_enc: assert frame->format isn't NONE before use [not found] <20231217110109.264409-1-quinkblack@foxmail.com> @ 2023-12-17 11:01 ` Zhao Zhili 2023-12-18 11:21 ` Anton Khirnov 0 siblings, 1 reply; 2+ messages in thread From: Zhao Zhili @ 2023-12-17 11:01 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Zhao Zhili From: Zhao Zhili <zhilizhao@tencent.com> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> --- fftools/ffmpeg_enc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 9141dab6a4..ac38e8db75 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -206,6 +206,7 @@ int enc_open(void *opaque, const AVFrame *frame) switch (enc_ctx->codec_type) { case AVMEDIA_TYPE_AUDIO: + av_assert0(frame->format != AV_SAMPLE_FMT_NONE); enc_ctx->sample_fmt = frame->format; enc_ctx->sample_rate = frame->sample_rate; ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout); @@ -227,6 +228,7 @@ int enc_open(void *opaque, const AVFrame *frame) av_mul_q(ost->frame_aspect_ratio, (AVRational){ enc_ctx->height, enc_ctx->width }) : frame->sample_aspect_ratio; + av_assert0(frame->format != AV_PIX_FMT_NONE); enc_ctx->pix_fmt = frame->format; if (ost->bits_per_raw_sample) -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_enc: assert frame->format isn't NONE before use 2023-12-17 11:01 ` [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_enc: assert frame->format isn't NONE before use Zhao Zhili @ 2023-12-18 11:21 ` Anton Khirnov 0 siblings, 0 replies; 2+ messages in thread From: Anton Khirnov @ 2023-12-18 11:21 UTC (permalink / raw) To: FFmpeg development discussions and patches; +Cc: Zhao Zhili Quoting Zhao Zhili (2023-12-17 12:01:09) > From: Zhao Zhili <zhilizhao@tencent.com> > > Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> > --- > fftools/ffmpeg_enc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c > index 9141dab6a4..ac38e8db75 100644 > --- a/fftools/ffmpeg_enc.c > +++ b/fftools/ffmpeg_enc.c > @@ -206,6 +206,7 @@ int enc_open(void *opaque, const AVFrame *frame) > > switch (enc_ctx->codec_type) { > case AVMEDIA_TYPE_AUDIO: > + av_assert0(frame->format != AV_SAMPLE_FMT_NONE); > enc_ctx->sample_fmt = frame->format; > enc_ctx->sample_rate = frame->sample_rate; > ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout); > @@ -227,6 +228,7 @@ int enc_open(void *opaque, const AVFrame *frame) > av_mul_q(ost->frame_aspect_ratio, (AVRational){ enc_ctx->height, enc_ctx->width }) : > frame->sample_aspect_ratio; > > + av_assert0(frame->format != AV_PIX_FMT_NONE); I'd prefer if you did this at the top of the block, right after case. Can also check dimensions for video and sample rate/channel layout for audio. -- Anton Khirnov _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-18 11:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20231217110109.264409-1-quinkblack@foxmail.com>
2023-12-17 11:01 ` [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_enc: assert frame->format isn't NONE before use Zhao Zhili
2023-12-18 11:21 ` Anton Khirnov
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git