From patchwork Mon Apr 29 22:45:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fumoboy007 X-Patchwork-Id: 12942 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 B28DF447CDC for ; Tue, 30 Apr 2019 01:46:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BEAA68A750; Tue, 30 Apr 2019 01:46:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mr85p00im-hyfv06011301.me.com (mr85p00im-hyfv06011301.me.com [17.58.23.184]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24FCA689AFD for ; Tue, 30 Apr 2019 01:46:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=04042017; t=1556577970; bh=a7ts09U1QVml5W6f/jf7dLdT2A2EShu5Zwu8sDsgkW0=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=C1a+LIx7qg0xMAsQs5MeleVrAr4xcM17y4XVLA0XE9p4c597oH8RiZKRuY4O9h6gg VwnUBC5cIz3c3RcfiGdoos92l0hXDWI3QvtiXIJHiXyV0WX+dNKsUDxokhmDPSUnn7 MlZnxQBxAuXpq+El11HcWwkLkThgOkXiO7No09LfJREeXCz0I8DsHY5eEchdVcehm0 K9KMXcJ9aUYKPswOOJ/e5U4aNm2uA91hqR67wDZpHo5TTZU6yLrTMnrawdMFc8hLmw i1z9xltEvxjaPjam0Q1siPqRKvGpyXU7EjVMdrKx03JCXgNI21UQOBnrfnV3WD5BfZ tVGK93h/K5IMg== Received: from MacBook-Pro.localdomain (adsl-76-236-28-223.dsl.chi2ca.sbcglobal.net [76.236.28.223]) by mr85p00im-hyfv06011301.me.com (Postfix) with ESMTPSA id DE6115800D5; Mon, 29 Apr 2019 22:46:09 +0000 (UTC) From: fumoboy007 To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2019 15:45:59 -0700 Message-Id: <20190429224559.81159-1-fumoboy007@me.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-04-29_14:, , signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=3 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 mlxlogscore=634 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1812120000 definitions=main-1904290148 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: Do not output subtitle frames if the packet is marked with `AV_PKT_FLAG_DISCARD`. 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: fumoboy007 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" One situation where a subtitle packet can be marked for discard is when demuxing an MOV file that has an edit list. --- libavcodec/decode.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6c31166ec2..204bd50fa3 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1149,8 +1149,14 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, } } - if (*got_sub_ptr) - avctx->frame_number++; + if (*got_sub_ptr) { + if (avpkt->flags & AV_PKT_FLAG_DISCARD) { + *got_sub_ptr = 0; + avsubtitle_free(sub); + } else { + avctx->frame_number++; + } + } } return ret;