virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avformat/mux: Unify setting number of muxed packets

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt
2020-03-12 18:54:08 +01:00
committed by Michael Niedermayer
parent 5c5ab88967
commit fa5bff611d
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mux.c
View File

@ -763,7 +763,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) { if (ret < 0) {
pkt->pts = pts_backup; pkt->pts = pts_backup;
pkt->dts = dts_backup; pkt->dts = dts_backup;
} } else
s->streams[pkt->stream_index]->nb_frames++;
return ret; return ret;
} }
@ -912,11 +913,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
#endif #endif
ret = write_packet(s, pkt); return write_packet(s, pkt);
if (ret >= 0)
s->streams[pkt->stream_index]->nb_frames++;
return ret;
} }
#define CHUNK_START 0x1000 #define CHUNK_START 0x1000
@ -1237,8 +1234,6 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
ret = write_packet(s, &opkt); ret = write_packet(s, &opkt);
if (ret >= 0)
s->streams[opkt.stream_index]->nb_frames++;
av_packet_unref(&opkt); av_packet_unref(&opkt);
@ -1263,8 +1258,6 @@ int av_write_trailer(AVFormatContext *s)
break; break;
ret = write_packet(s, &pkt); ret = write_packet(s, &pkt);
if (ret >= 0)
s->streams[pkt.stream_index]->nb_frames++;
av_packet_unref(&pkt); av_packet_unref(&pkt);