diff mbox

[FFmpeg-devel] lavf/dss: Do not fail randomly if input contains 0xff

Message ID 201701121415.55365.cehoyos@ag.or.at
State Accepted
Commit f31bac596f93e02b49d04733e57770e183a3d0c8
Headers show

Commit Message

Carl Eugen Hoyos Jan. 12, 2017, 1:15 p.m. UTC
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 <cehoyos@ag.or.at>
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(-)

Comments

Paul B Mahol Jan. 12, 2017, 1:55 p.m. UTC | #1
On 1/12/17, Carl Eugen Hoyos <cehoyos@ag.or.at> wrote:
> 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
>

Should be ok.
Carl Eugen Hoyos Jan. 12, 2017, 2:06 p.m. UTC | #2
2017-01-12 14:55 GMT+01:00 Paul B Mahol <onemda@gmail.com>:
> On 1/12/17, Carl Eugen Hoyos <cehoyos@ag.or.at> wrote:
>>
>> Please correct me if I miss something but I don't see why
>> the dss demuxer tests the content of dss_sp frames.
>
> Should be ok.

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

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: