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

movsub_bsf: Fix mov2textsub regression

Browse Source 
The mov flavour of timed text uses the first two bytes of the packet as
a length field. And up until 11bef2fe said length field has been read
correctly in the mov2textsub bsf. But since then the next two bytes are
read as if they were the length field. This is fixed in this commit.

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 800f618a34)
This commit is contained in:
Andreas Rheinhardt
2019-06-23 06:46:12 +02:00
committed by James Almer
parent 82e1fb864b
commit 5ace419519
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/movsub_bsf.c
View File

@ -75,8 +75,8 @@ static int mov2textsub(AVBSFContext *ctx, AVPacket *pkt)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
pkt->data += 2;
pkt->size = FFMIN(pkt->size - 2, AV_RB16(pkt->data)); pkt->size = FFMIN(pkt->size - 2, AV_RB16(pkt->data));
pkt->data += 2;
return 0; return 0;
} }