You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
fftools/ffmpeg_mux: reindent
This commit is contained in:
@@ -98,16 +98,16 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
ret = av_packet_make_refcounted(pkt);
|
ret = av_packet_make_refcounted(pkt);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
tmp_pkt = av_packet_alloc();
|
tmp_pkt = av_packet_alloc();
|
||||||
if (!tmp_pkt)
|
if (!tmp_pkt)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
av_packet_move_ref(tmp_pkt, pkt);
|
av_packet_move_ref(tmp_pkt, pkt);
|
||||||
ms->muxing_queue_data_size += tmp_pkt->size;
|
ms->muxing_queue_data_size += tmp_pkt->size;
|
||||||
}
|
}
|
||||||
av_fifo_write(ms->muxing_queue, &tmp_pkt, 1);
|
av_fifo_write(ms->muxing_queue, &tmp_pkt, 1);
|
||||||
|
|
||||||
@@ -236,20 +236,20 @@ void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
/*
|
/*
|
||||||
* Audio encoders may split the packets -- #frames in != #packets out.
|
* Audio encoders may split the packets -- #frames in != #packets out.
|
||||||
* But there is no reordering, so we can limit the number of output packets
|
* But there is no reordering, so we can limit the number of output packets
|
||||||
* by simply dropping them here.
|
* by simply dropping them here.
|
||||||
* Counting encoded video frames needs to be done separately because of
|
* Counting encoded video frames needs to be done separately because of
|
||||||
* reordering, see do_video_out().
|
* reordering, see do_video_out().
|
||||||
*/
|
*/
|
||||||
if (!(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed)) {
|
if (!(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed)) {
|
||||||
if (ost->frame_number >= ost->max_frames) {
|
if (ost->frame_number >= ost->max_frames) {
|
||||||
av_packet_unref(pkt);
|
av_packet_unref(pkt);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
ost->frame_number++;
|
||||||
}
|
}
|
||||||
ost->frame_number++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (of->mux->header_written) {
|
if (of->mux->header_written) {
|
||||||
|
Reference in New Issue
Block a user