* Re: [FFmpeg-devel] [PATCH v2 2/3] fftools/ffmpeg_filter: remove semicolon after code block
2023-12-19 15:37 ` [FFmpeg-devel] [PATCH v2 2/3] fftools/ffmpeg_filter: remove semicolon after code block Zhao Zhili
@ 2023-12-19 10:32 ` Anton Khirnov
0 siblings, 0 replies; 4+ messages in thread
From: Anton Khirnov @ 2023-12-19 10:32 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Zhao Zhili
Quoting Zhao Zhili (2023-12-19 16:37:02)
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> ---
> fftools/ffmpeg_filter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
> index 69a49a071e..7cc7abba64 100644
> --- a/fftools/ffmpeg_filter.c
> +++ b/fftools/ffmpeg_filter.c
> @@ -2456,7 +2456,7 @@ static int read_frames(FilterGraph *fg, FilterGraphThread *fgt,
> }
> }
> did_step = 1;
> - };
> + }
ok
--
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] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2 3/3] fftools/ffmpeg_enc: assert necessary frame fields before create encoder
2023-12-19 15:37 ` [FFmpeg-devel] [PATCH v2 3/3] fftools/ffmpeg_enc: assert necessary frame fields before create encoder Zhao Zhili
@ 2023-12-19 10:33 ` Anton Khirnov
0 siblings, 0 replies; 4+ messages in thread
From: Anton Khirnov @ 2023-12-19 10:33 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Zhao Zhili
Quoting Zhao Zhili (2023-12-19 16:37:03)
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> ---
> fftools/ffmpeg_enc.c | 6 ++++++
> 1 file changed, 6 insertions(+)
Ok.
--
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] 4+ messages in thread
* [FFmpeg-devel] [PATCH v2 2/3] fftools/ffmpeg_filter: remove semicolon after code block
[not found] <20231219153703.450826-1-quinkblack@foxmail.com>
@ 2023-12-19 15:37 ` Zhao Zhili
2023-12-19 10:32 ` Anton Khirnov
2023-12-19 15:37 ` [FFmpeg-devel] [PATCH v2 3/3] fftools/ffmpeg_enc: assert necessary frame fields before create encoder Zhao Zhili
1 sibling, 1 reply; 4+ messages in thread
From: Zhao Zhili @ 2023-12-19 15:37 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
From: Zhao Zhili <zhilizhao@tencent.com>
---
fftools/ffmpeg_filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 69a49a071e..7cc7abba64 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -2456,7 +2456,7 @@ static int read_frames(FilterGraph *fg, FilterGraphThread *fgt,
}
}
did_step = 1;
- };
+ }
return (fgp->nb_outputs_done == fg->nb_outputs) ? AVERROR_EOF : 0;
}
--
2.25.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] 4+ messages in thread
* [FFmpeg-devel] [PATCH v2 3/3] fftools/ffmpeg_enc: assert necessary frame fields before create encoder
[not found] <20231219153703.450826-1-quinkblack@foxmail.com>
2023-12-19 15:37 ` [FFmpeg-devel] [PATCH v2 2/3] fftools/ffmpeg_filter: remove semicolon after code block Zhao Zhili
@ 2023-12-19 15:37 ` Zhao Zhili
2023-12-19 10:33 ` Anton Khirnov
1 sibling, 1 reply; 4+ messages in thread
From: Zhao Zhili @ 2023-12-19 15:37 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
From: Zhao Zhili <zhilizhao@tencent.com>
---
fftools/ffmpeg_enc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index 57590a43a3..2a7fba0c51 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -206,6 +206,9 @@ 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 &&
+ frame->sample_rate > 0 &&
+ frame->ch_layout.nb_channels > 0);
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);
@@ -220,6 +223,9 @@ int enc_open(void *opaque, const AVFrame *frame)
break;
case AVMEDIA_TYPE_VIDEO: {
+ av_assert0(frame->format != AV_PIX_FMT_NONE &&
+ frame->width > 0 &&
+ frame->height > 0);
enc_ctx->width = frame->width;
enc_ctx->height = frame->height;
enc_ctx->sample_aspect_ratio = ost->st->sample_aspect_ratio =
--
2.25.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] 4+ messages in thread
end of thread, other threads:[~2023-12-19 10:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20231219153703.450826-1-quinkblack@foxmail.com>
2023-12-19 15:37 ` [FFmpeg-devel] [PATCH v2 2/3] fftools/ffmpeg_filter: remove semicolon after code block Zhao Zhili
2023-12-19 10:32 ` Anton Khirnov
2023-12-19 15:37 ` [FFmpeg-devel] [PATCH v2 3/3] fftools/ffmpeg_enc: assert necessary frame fields before create encoder Zhao Zhili
2023-12-19 10:33 ` 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