RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

avformat/oggenc: don't flush twice when the last packet is side data only

Browse Source 
Commit 18f24527eb accidentally made side data only packets be handled like a
flush request. Fix this regression by effectively ignoring them as was the
original intention.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-12-30 09:34:04 -03:00
parent 99e3d26f20
commit a781279871
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/oggenc.c
View File

@ -687,8 +687,8 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int i; int i;
if (pkt && pkt->size) if (pkt)
return ogg_write_packet_internal(s, pkt); return pkt->size ? ogg_write_packet_internal(s, pkt) : 0;
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
OGGStreamContext *oggstream = s->streams[i]->priv_data; OGGStreamContext *oggstream = s->streams[i]->priv_data;

2
tests/ref/lavf/ogg
View File

@ -1,3 +1,3 @@
507a906a705d16f3a3b0c4114c738110 *tests/data/lavf/lavf.ogg 81b9366cacb23644c2803585dced9996 *tests/data/lavf/lavf.ogg
13516 tests/data/lavf/lavf.ogg 13516 tests/data/lavf/lavf.ogg
tests/data/lavf/lavf.ogg CRC=0x3a1da17e tests/data/lavf/lavf.ogg CRC=0x3a1da17e