[FFmpeg-devel] [PATCH 14/18] fftools/ffmpeg_filter: shorten a variable name
Anton Khirnov
anton at khirnov.net
Sat Aug 26 18:11:40 EEST 2023
---
fftools/ffmpeg_filter.c | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 1343e48fab..e65e7cb64d 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -1745,13 +1745,13 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush)
{
FilterGraphPriv *fgp = fgp_from_fg(ofp->ofilter.graph);
OutputStream *ost = ofp->ofilter.ost;
- AVFrame *filtered_frame = fgp->frame;
+ AVFrame *frame = fgp->frame;
AVFilterContext *filter = ofp->filter;
FrameData *fd;
int ret;
- ret = av_buffersink_get_frame_flags(filter, filtered_frame,
- AV_BUFFERSINK_FLAG_NO_REQUEST);
+ ret = av_buffersink_get_frame_flags(filter, frame,
+ AV_BUFFERSINK_FLAG_NO_REQUEST);
if (ret < 0) {
if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
av_log(fgp, AV_LOG_WARNING,
@@ -1766,26 +1766,23 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush)
return 1;
}
if (ost->finished) {
- av_frame_unref(filtered_frame);
+ av_frame_unref(frame);
return 0;
}
- if (filtered_frame->pts != AV_NOPTS_VALUE) {
+ if (frame->pts != AV_NOPTS_VALUE) {
AVRational tb = av_buffersink_get_time_base(filter);
- ost->filter->last_pts = av_rescale_q(filtered_frame->pts, tb,
- AV_TIME_BASE_Q);
- filtered_frame->time_base = tb;
+ ost->filter->last_pts = av_rescale_q(frame->pts, tb, AV_TIME_BASE_Q);
+ frame->time_base = tb;
if (debug_ts)
av_log(fgp, AV_LOG_INFO, "filter_raw -> pts:%s pts_time:%s time_base:%d/%d\n",
- av_ts2str(filtered_frame->pts),
- av_ts2timestr(filtered_frame->pts, &tb),
- tb.num, tb.den);
+ av_ts2str(frame->pts), av_ts2timestr(frame->pts, &tb), tb.num, tb.den);
}
- fd = frame_data(filtered_frame);
+ fd = frame_data(frame);
if (!fd) {
- av_frame_unref(filtered_frame);
+ av_frame_unref(frame);
return AVERROR(ENOMEM);
}
@@ -1799,15 +1796,14 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush)
if (fr.num > 0 && fr.den > 0) {
fd->frame_rate_filter = fr;
- if (!filtered_frame->duration) {
- filtered_frame->duration = av_rescale_q(1, av_inv_q(fr),
- filtered_frame->time_base);
+ if (!frame->duration) {
+ frame->duration = av_rescale_q(1, av_inv_q(fr), frame->time_base);
}
}
}
- ret = enc_frame(ost, filtered_frame);
- av_frame_unref(filtered_frame);
+ ret = enc_frame(ost, frame);
+ av_frame_unref(frame);
if (ret < 0)
return ret;
--
2.40.1
More information about the ffmpeg-devel
mailing list