From patchwork Thu Jan 12 13:15:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2195 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1269711vsb; Thu, 12 Jan 2017 05:16:04 -0800 (PST) X-Received: by 10.28.54.195 with SMTP id y64mr6010847wmh.10.1484226964585; Thu, 12 Jan 2017 05:16:04 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 91si7273525wrd.118.2017.01.12.05.16.04; Thu, 12 Jan 2017 05:16:04 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E18968A34A; Thu, 12 Jan 2017 15:15:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2498868A1B2 for ; Thu, 12 Jan 2017 15:15:50 +0200 (EET) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cRfES-0003IX-RV for ffmpeg-devel@ffmpeg.org; Thu, 12 Jan 2017 14:15:56 +0100 Received: from [192.168.1.3] ([80.110.108.39]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id XRFv1u01G0r275s01RFwHr; Thu, 12 Jan 2017 14:15:56 +0100 X-SourceIP: 80.110.108.39 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Thu, 12 Jan 2017 14:15:55 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201701121415.55365.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/dss: Do not fail randomly if input contains 0xff 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Please correct me if I miss something but I don't see why the dss demuxer tests the content of dss_sp frames. Please comment, Carl Eugen From 5b975c20361d80ac7f889f05c23efd447873683f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 12 Jan 2017 14:12:35 +0100 Subject: [PATCH] lavf/dss: Do not fail randomly if the input contains 0xff. Fixes decoding the sample from ticket #6072 with ffmpeg. --- libavformat/dss.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/dss.c b/libavformat/dss.c index cbf6e17..083eb4a 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -265,9 +265,6 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) goto error_eof; } - if (pkt->data[0] == 0xff) - return AVERROR_INVALIDDATA; - return pkt->size; error_eof: