From patchwork Sun Jun 23 04:46:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13680 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 483CB447EA6 for ; Sun, 23 Jun 2019 07:47:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DDB468A8E7; Sun, 23 Jun 2019 07:47:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6678668071C for ; Sun, 23 Jun 2019 07:47:23 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id r16so10277713wrl.11 for ; Sat, 22 Jun 2019 21:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8q9N55P9WtS7rKCL9xbSRGPwA9l8DNrjUKW8QbLvP8U=; b=Z8ZGj+ZyRe7V6Qeml3uij835AmM4pfbWa2hCEc7nPpONxHid5rvwFyM6keu4q2G+K4 Q2jy2YrvdN7Yhlyi5WTKNrcD8vQslsSD4uF+SDynkBp/48ITwFDTZVCVzGxvgca0PCUi IAxJbr8XxOaIqI9jFEmxVt/Q69UPUfgck33Dzkdfl+b6FCZLMrerMRwrM/bsVnH10ab8 9Sua1ajzdiGStNQ2MGNwwEBg2cyc6PA3O49K0Qzd8PkUTsabsTJpm9Lx8kLDsC7joMi6 AOPOqx58kSJ8ZqOtFxN/vIJZd2dvG/Gt8BKCDrpbj9MtbXEAzsTisd/8oab9omNnfdgv GH4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8q9N55P9WtS7rKCL9xbSRGPwA9l8DNrjUKW8QbLvP8U=; b=l686iDcgawvRQxYKzANtSU1XTJZu1FvvzCVfCC+a9wrjNwTXeLOcMVtLOruYaX+guE ob3J0HalsYoHG7BwXNxfWfXZNMUj0xpHVRh0fAw+jCUKVS+G+PyVBwujL2L/Lx5txlPN BLX7lF1o+sKDNBZw2ETWbfn7jPHtjnTllhwC+SjRHUEOcHY5Me7ZUE9BLwRkSqsjfh/m YuTtoq0IYVYz0l5Qb+8i1IendjCZnK3bvgFFFrVS/S8WxTHVDmNqpllKv8nzcddw8wwa zcQy/Q0sSDWzx+WUEawT1CdsK70WTQk7ytNVPLY9yTPXppv2tAekmj0oB8NRRJlesHFn WA5g== X-Gm-Message-State: APjAAAV+348U8aCAsKm26ikbMuS9xBVMqScGCwPG4biaVstp4j5+9nzx n3o/3+ATmJdPInb8thKWILkXeyrh X-Google-Smtp-Source: APXvYqxV26YuHHeEAcZh1g3OpDYx/HiokaPE/ewqHIPN9iafIKVM5Wi2BgtmxHNDi2WKAiWfYxm7nQ== X-Received: by 2002:a5d:4b43:: with SMTP id w3mr16639900wrs.166.1561265242768; Sat, 22 Jun 2019 21:47:22 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id u18sm5236422wmd.19.2019.06.22.21.47.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 22 Jun 2019 21:47:22 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Jun 2019 06:46:12 +0200 Message-Id: <20190623044612.18234-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] movsub_bsf: Fix mov2textsub regression X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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. Signed-off-by: Andreas Rheinhardt --- 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; }