From patchwork Mon Dec 4 02:53:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6534 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3896732jah; Sun, 3 Dec 2017 18:53:46 -0800 (PST) X-Google-Smtp-Source: AGs4zMZPzu5roQW/qfBHojIAtbTbd5/iqPh7cqsQ/8qQKFh8Y6w3xWZHgDX1awem1drdDsEr7Ias X-Received: by 10.223.170.214 with SMTP id i22mr11787097wrc.110.1512356026891; Sun, 03 Dec 2017 18:53:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512356026; cv=none; d=google.com; s=arc-20160816; b=VeBKqfKFR+LAI28y7Qv+7RC3J21OAuAlIFqtNxaHlmGm5M+TbnaXc7SHqdaNtu9QJG eoHOf43rvRRUAovCdfP0kTguIrJLbq+xJxOrVMKk13Xh32x3VgljVKgu3eirspaAsViW V3ILcAoSbio49RZPbC3zzAKxIfhPliHbnmWv9BRClq47d30od1WsDTAmwfADTEXNBYrr fGYLkjLqu9py6PA6Ticy6SByfeAjX26VUsC0MpJbEiULZ/dfBvf3nNojRuBpopoRPir/ l9NxGiePhLZlHHjEcwRAOlOrISfy6SX9BroyjLIhvIGiZ7G+T1iCdY64ETvFKGS4WJQB kvlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:message-id :date:thread-index:thread-topic:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=A/Qxr89jJeG6Vum07VCkuPEhrRj8dNRj+WKqSrTr+Vw=; b=GKQrxIE+fyjY8h56oKV60jDnMdRSaPl0vteo0F3v9yIIL3ZVNUzDZJnAAqGF3U9IXL zXLaEzCr8pU8Ss3kcsu0Anzh1n0mlc1g27VhMIW/AXSns7ixcIcl4Kzb/9q7B0zOX7E4 R+UcnK4jpPUFdtw+yZJSEEEX+ZuSJNcSwSESo0bP8mJ9QtNE9zRhBfyHjaCznGxji/F9 vA2MrWq+GELdR7LJgYKTkHHzZg0KhJuUV0myK7CAxb+QWLfo8gLv4PG9RLdnN8wfwxDm YQCJKv46nfu4rIhiNA4chXzMh8XiRSYGjsnJgrF8Qri7zGANoc7zV5jY8IZ5nPYqPGTm 32Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=n3XTHKsB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a4si10138360wrc.299.2017.12.03.18.53.46; Sun, 03 Dec 2017 18:53:46 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=n3XTHKsB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 969A468A195; Mon, 4 Dec 2017 04:53:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-oln040092011043.outbound.protection.outlook.com [40.92.11.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 188C968A032 for ; Mon, 4 Dec 2017 04:53:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=MSCx82U+6upksKVjhz95Hn8hUaf0lCIJC+/unL4ZKEI=; b=n3XTHKsBOmhU1fpCc4yDUBH/24q8eQDuiQdIO43YZcq4QTThb3GY+zMGJotNrhCqf59iBmLLexyQBNgvPnOx54QshTL5OqqSlPpNrWK5Fd3qybJxkyU6+nbmKzHL2Eg5DuDOMCzj/KbCRv7rgTcckMhyGMafC82vSC5f3c1gjK2MH8jLXfw52S/iotzkTWnBpyy+lE6Z51fwpqINlddcDnuEnMUgZj8FEeg33if8jsxJfE5jVLq+KoLuGQ5Pbjc21e+kHbRkNi9sQxuMj8EH6hBBdLVwXgh1+J5BTlAQXln8KVVZpIIIXa+QvbBDd0Qi4LHK04P7H8Q5+HJSYKYEPw== Received: from CO1NAM04FT039.eop-NAM04.prod.protection.outlook.com (10.152.90.52) by CO1NAM04HT241.eop-NAM04.prod.protection.outlook.com (10.152.91.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.239.4; Mon, 4 Dec 2017 02:53:36 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.90.55) by CO1NAM04FT039.mail.protection.outlook.com (10.152.91.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.239.4 via Frontend Transport; Mon, 4 Dec 2017 02:53:37 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) by DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) with mapi id 15.20.0282.012; Mon, 4 Dec 2017 02:53:36 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] fftools/ffprobe: Fix for ticket 6796 (ffprobe show_frames ts dvbsubs infinite loop) Thread-Index: AQHTbKsUfHSF+S8DrkGiMG/pxy2jqw== Date: Mon, 4 Dec 2017 02:53:36 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:8AC9D7FA7E9A389F92F67A66B0364A4E4B1B6929A3CE0E818BAB5907E4B35804; UpperCasedChecksum:5D6F0A734278C3BB749FCAED421D8F06BC136DFFE611E8DED7C9C49B9C18069F; SizeAsReceived:6991; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Wd2c69ZKV6zn3WGWql3Ad+wSlYCIDiG4] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CO1NAM04HT241; 6:qzdQnhN/3P/b0LvcMloc4YfJrzBLkN9Zo7W9S/raf0pLfWogQwCiY5T6Eaj82OzyiosmawpMmgGigKsX+g+Imw9AZQV970zCI8x7aQ8RshINIJO0ooOl1O+0mxlodbawmwjK93U8c4IVoxKc6+JnbtqevsWePaCDa5Li6fjPOeJ4Ir3SBfhQgh2NPbm0d5bf0KCi4ZbgDU5i/4pn4S1OnkoAqevFBjOY0RFsWsHPyz/V7XJJND8jKE3vvPPJNcPYHiGKjKMJwFUYJmi2RxgnasrijO4SMrMst5sHHESVzQ78mUWGaVZW5lT53fgRyApl1WM3RCv+ENxPtCHBtzg/ZbgKhW76b1MK+piw44BOjaw=; 5:ZwaZ6IR3qejLlpnrUJ6pQIZlELyGoz7Nt0HNLpD3uJ2pGXFw2azJkR1HLqhq5jeOq+bzV5+RVGLaCCl/dpHGwgUN7KwfOpStOyjLacJYSJKc7H51eLMH7D6R8ohI/yl8cO7ycw9cSoNfCwVvU9eDhjRV7cER9wN3/TYwzfOKycI=; 24:04lcw9oJLrqrTkYUK6p5badCr58VbZzF9rvw3n2gBUxAsIFbttez0r3s/mQvh4OGm8SMeZs2qRyb2rmnXezdar5PrneCkNGgy11pkf0vIFo=; 7:hhqPSSVVidXs7kXfCEYgWA43/Trh+j+cFGDYCyI04s+JL6YPxWDdkDsvvcnYNYflnyDPni4fi36UVJ9r+Q1IZ+kGMya7oVb0pFXBPEJQl1ceOmHQRBTTrzRUXgzMmXgrrJUKt71uGZwcUA1huMcA+KzG9oxZ3lj1uVsKHz5j49cqM42A8Tcj/xPubswSEFEv7vyJX6AvbhCSZCIfUl2WU0kgLy0ldtox2GGafjttvOjKhpyD+pl2rYkT9ylcq3xi x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:CO1NAM04HT241; x-ms-exchange-slblob-mailprops: Eluf6BVNkXl0FBc/KdLtA+q0esmksJYCFjzW6rxrnyyFrFLikdSKwMRW5FfNpRx8oq9tEC0qC/1VlmSKax7coCbi5cRZYFmzQ2kcTZVB79fgRqBKf7W3snrs9LWfXWzUbRUi9zDhquXNBkevAwURWyozfi1ZTiXL0EVuLuI6BpjesF84PAMRy69uTULG4iYX1pk37g26ux7IKo/kXd1OUWN2vQQnHnOJnguhq/it/evE83d4GeBFXw+m3o8PkQLt0u7bL3F0pn2wucbO1ToKjjnTclTe26n1Oq8LEFGnx7hCXLEmaEDX9Nw2wMvmD1C6rGk6G99RFYhzLu+hpX8dabMvjWOvENomrDE17WjC/2gUL0xM22v3XM/pTMaI2qjeAL2rUERn1rOf0S9oLEtD0Qb18juMssgDur7WDux18B9MbYfOZ9FzwufEMTkNbzbGDdm7DVEJi2TUNvhIqjMVlZJQwjv2XY9QcFxOfmIImdVIBCkfUxWkhJVY0ukUZ5IY+msdImKMVsx6HqrNVBx1rd9IPLpEEaN/HJoqlewVbFullIUMJwirvvR7F8+6nUh43YlOb6qhlksuc0DW/oMJJ5bAHQvRFp61iacPEaBwK9jRMkGdzcTSkA2NLNuJjzz3QRAHqaIooAHARQ1tOVEY30uGzyEH3PHC x-ms-traffictypediagnostic: CO1NAM04HT241: x-ms-office365-filtering-correlation-id: dd756e82-6de3-4e86-106b-08d53ac236ab x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:CO1NAM04HT241; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CO1NAM04HT241; x-forefront-prvs: 051158ECBB x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:CO1NAM04HT241; H:DM5PR22MB0681.namprd22.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd756e82-6de3-4e86-106b-08d53ac236ab X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2017 02:53:36.6477 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1NAM04HT241 Subject: [FFmpeg-devel] [PATCH] fftools/ffprobe: Fix for ticket 6796 (ffprobe show_frames ts dvbsubs infinite loop) 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: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- fftools/ffprobe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 0e7a771..6ddd81e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2280,6 +2280,7 @@ static av_always_inline int process_frame(WriterContext *w, break; default: *packet_new = 0; + break; } } else { *packet_new = 0; @@ -2290,6 +2291,7 @@ static av_always_inline int process_frame(WriterContext *w, if (got_frame) { int is_sub = (par->codec_type == AVMEDIA_TYPE_SUBTITLE); nb_streams_frames[pkt->stream_index]++; + got_frame = (par->codec_type == AVMEDIA_TYPE_SUBTITLE) ? 0: got_frame; if (do_show_frames) if (is_sub) show_subtitle(w, &sub, ifile->streams[pkt->stream_index].st, fmt_ctx);