virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avformat/vobsub: raise packet even if apparently incomplete.

Browse Source 
This restore the latest packet which was dropped from the FATE test in
dbfe61100.
This commit is contained in:
Clément Bœsch 2013-10-04 09:25:08 +00:00 committed by Clément Bœsch
parent dbfe61100b
commit d4dc673455
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mpeg.c
View File

@ -849,8 +849,11 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
int pkt_size; int pkt_size;
ret = mpegps_read_pes_header(vobsub->sub_ctx, NULL, &startcode, &pts, &dts); ret = mpegps_read_pes_header(vobsub->sub_ctx, NULL, &startcode, &pts, &dts);
if (ret < 0) if (ret < 0) {
if (pkt->size) // raise packet even if incomplete
break;
FAIL(ret); FAIL(ret);
}
to_read = ret & 0xffff; to_read = ret & 0xffff;
new_pos = avio_tell(pb); new_pos = avio_tell(pb);
pkt_size = ret + (new_pos - old_pos); pkt_size = ret + (new_pos - old_pos);

1
tests/ref/fate/sub2video
View File

@ -92,3 +92,4 @@
1, 210600, 210600, 1831, 665, 0x55580135, F=0x0 1, 210600, 210600, 1831, 665, 0x55580135, F=0x0
1, 214771, 214771, 1558, 1216, 0x50d1f6c5, F=0x0 1, 214771, 214771, 1558, 1216, 0x50d1f6c5, F=0x0
1, 225640, 225640, 2127, 2133, 0x670c11a5, F=0x0 1, 225640, 225640, 2127, 2133, 0x670c11a5, F=0x0
1, 227834, 227834, 1262, 1264, 0xc1d9fc57, F=0x0