RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_mux: use output stream parameters in of_streamcopy() 

They should always be the same as the input stream parameters, but this
reduces the need to access InputStream in muxing code.
This commit is contained in:
Anton Khirnov 2023-04-13 14:27:40 +02:00
parent 2178ff2162
commit 150c992490
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fftools/ffmpeg_mux.c
View File

@ -425,11 +425,11 @@ void of_streamcopy(InputStream *ist, OutputStream *ost,
if (pkt->dts == AV_NOPTS_VALUE) { if (pkt->dts == AV_NOPTS_VALUE) {
opkt->dts = av_rescale_q(dts, AV_TIME_BASE_Q, opkt->time_base); opkt->dts = av_rescale_q(dts, AV_TIME_BASE_Q, opkt->time_base);
} else if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { } else if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
int duration = av_get_audio_frame_duration2(ist->par, pkt->size); int duration = av_get_audio_frame_duration2(ost->par_in, pkt->size);
if(!duration) if(!duration)
duration = ist->par->frame_size; duration = ost->par_in->frame_size;
opkt->dts = av_rescale_delta(pkt->time_base, pkt->dts, opkt->dts = av_rescale_delta(pkt->time_base, pkt->dts,
(AVRational){1, ist->par->sample_rate}, duration, (AVRational){1, ost->par_in->sample_rate}, duration,
&ist->filter_in_rescale_delta_last, opkt->time_base); &ist->filter_in_rescale_delta_last, opkt->time_base);
/* dts will be set immediately afterwards to what pts is now */ /* dts will be set immediately afterwards to what pts is now */
opkt->pts = opkt->dts - ost_tb_start_time; opkt->pts = opkt->dts - ost_tb_start_time;