[FFmpeg-cvslog] movsub_bsf: Fix mov2textsub regression

Andreas Rheinhardt git at videolan.org
Tue Jun 25 05:57:58 EEST 2019


ffmpeg | branch: release/4.1 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 23 06:46:12 2019 +0200| [b5229a0b3e422e0de5f0f3d06b354aa8abe901e3] | committer: James Almer

movsub_bsf: Fix mov2textsub regression

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 at overt.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 800f618a340d122754e7bdb82c22463cb9bd17b0)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5229a0b3e422e0de5f0f3d06b354aa8abe901e3
---

 libavcodec/movsub_bsf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c
index 5878607061..cd48aa7bb8 100644
--- a/libavcodec/movsub_bsf.c
+++ b/libavcodec/movsub_bsf.c
@@ -75,8 +75,8 @@ static int mov2textsub(AVBSFContext *ctx, AVPacket *pkt)
        return AVERROR_INVALIDDATA;
     }
 
-    pkt->data += 2;
     pkt->size  = FFMIN(pkt->size - 2, AV_RB16(pkt->data));
+    pkt->data += 2;
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list