From patchwork Tue Dec 18 13:56:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11459 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 AD66044E10D for ; Tue, 18 Dec 2018 16:03:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C88CE68A9B8; Tue, 18 Dec 2018 16:03:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8684B68A9B1 for ; Tue, 18 Dec 2018 16:03:10 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id l9so15977538wrt.13 for ; Tue, 18 Dec 2018 06:03:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=WPrGm/X1mzyZ1tqu0VF4Jv4NCQKBxG7bK6ovXpXxgyU=; b=O5KU2uvQyUqq9mm6Cu3bNXp2AnsV8/kXf733pjOkiiGHNj1zBYJMryV9nK7yL0lSJi zk1FInYuWipvZeO9M4LZPHwnchVKO21lBJIiLEuQjl93hslO4fVKkPEMYUFyK6vGQZYK BOwPbB3k5pfo3npD1SYkdO0zPuS8J/9kfnMYcLkVStxMxrgrrdc2mI7IXNeR3wQztOoC FlLEl9y4BV6T0laDcmDTSFqAeRSY3fqBVp24buyso0zohANDbMiIAuEqgUFzDBqhT73O ncXpm5UWVGsgQaccUdP/yBiI+vzORiZX4J/9EEJy0L6F1MN3CASjeMe23QcvVQ/2uuDq nR9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=WPrGm/X1mzyZ1tqu0VF4Jv4NCQKBxG7bK6ovXpXxgyU=; b=XpmsoLHRbZGpkt5GdB1IDVKtqwXwtTZwc6Qd5IICFW75qY4h1+bfsz05cNyP0Sz7m2 Rp35b4Y0+y0AWRq8k/v2beKfwBIXRfM7klD38Trw/D7EYwCtIbBlvT9cR3EyRcPR2qQ9 i6xD0Rk4NXQnx5wG8lCC02UNPxidi3bZXJ1ByCdBYd85TSxQAowj554JV5zvREtcqKOw EYiazV64lyUrGiKZlXOPLMs1TMuN3mcXv0XCxSx6Rn/Om9+IXE/4OeaD062n3JF9ZsSE YyBsm9j+fdfAcK6ClX1uPSKQQoZGevejkfCG9A9kWQGw1MHJWOMzDl6PfQRjGdp3wukL piBg== X-Gm-Message-State: AA+aEWbI6ZODBMZswrlkgg+VEj+RAOGamxu9H61BgW4Wt4zFzavIAK7q NvSnOyawIri6s3+zEMxkBT31Ktjb X-Google-Smtp-Source: AFSGD/UlAqed8wZDRj7HwedwxV9oEBtwmcEFMvVCD9NGYaV9Xc8c9POUUrfKg8g0pvz++rGcAT19Gg== X-Received: by 2002:adf:80cf:: with SMTP id 73mr1407438wrl.57.1545141426341; Tue, 18 Dec 2018 05:57:06 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id d2sm2747498wrs.97.2018.12.18.05.57.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 05:57:05 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Dec 2018 14:56:55 +0100 Message-Id: <20181218135655.4152-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181218135655.4152-1-onemda@gmail.com> References: <20181218135655.4152-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/nutdec: skip EOR packets if they are subtitles 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/nutdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 056ef59d00..1d1c449bbd 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -1080,6 +1080,10 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code) stc = &nut->stream[stream_id]; + if (stc->last_flags & FLAG_EOR && + s->streams[stream_id]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) + return 1; + if (stc->last_flags & FLAG_KEY) stc->skip_until_key_frame = 0;