Skip to content

F
ffmpeg.wasm-core
Commit 261e8ccb authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

ffmpeg: drop redundant frame_pts value 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 2d0440f9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
ffmpeg.c
View file @ 261e8ccb
......@@ -1214,7 +1214,6 @@ static int reap_filters(void)
{
AVFrame *filtered_frame = NULL;
int i;
int64_t frame_pts;
/* Reap all buffers present in the buffer sinks */
for (i = 0; i < nb_output_streams; i++) {
......@@ -1247,10 +1246,10 @@ static int reap_filters(void)
av_frame_unref(filtered_frame);
continue;
}
frame_pts = AV_NOPTS_VALUE;
if (filtered_frame->pts != AV_NOPTS_VALUE) {
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
filtered_frame->pts = frame_pts =
filtered_frame->pts =
av_rescale_q(filtered_frame->pts, filter->inputs[0]->time_base, enc->time_base) -
av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base);
}
......@@ -1259,7 +1258,6 @@ static int reap_filters(void)
switch (filter->inputs[0]->type) {
case AVMEDIA_TYPE_VIDEO:
filtered_frame->pts = frame_pts;
if (!ost->frame_aspect_ratio.num)
enc->sample_aspect_ratio = filtered_frame->sample_aspect_ratio;
......@@ -1272,7 +1270,6 @@ static int reap_filters(void)
do_video_out(of->ctx, ost, filtered_frame);
break;
case AVMEDIA_TYPE_AUDIO:
filtered_frame->pts = frame_pts;
if (!(enc->codec->capabilities & CODEC_CAP_PARAM_CHANGE) &&
enc->channels != av_frame_get_channels(filtered_frame)) {
av_log(NULL, AV_LOG_ERROR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment