diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-02-09 19:32:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-11 02:54:09 +0100 |
| commit | 20708223dbd35b69a1b7cb542ee340c7c22af504 (patch) | |
| tree | 414944b0daa6aa4e520b0a285d266cdf87aafb58 | |
| parent | a30ac54a19d27920ec262ebb104e1f48092a3715 (diff) | |
| download | ffmpeg-20708223dbd35b69a1b7cb542ee340c7c22af504.tar.gz | |
Do not fail DVB sub decoding because of a few padding bytes
Instead of returning an error when bytes are left over, just return
the number of actually used bytes as other decoders do.
Instead add a special case so an error will be returned when none
of the data looks valid to avoid making debugging a pain.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 4a72765a1c94b05bd3053b1f34f8457a3b71d714)
| -rw-r--r-- | libavcodec/dvbsubdec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 8cc8d4fc83..401144f902 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1423,7 +1423,7 @@ static int dvbsub_decode(AVCodecContext *avctx, #endif - if (buf_size <= 2) + if (buf_size <= 2 || *buf != 0x0f) return -1; p = buf; @@ -1467,12 +1467,7 @@ static int dvbsub_decode(AVCodecContext *avctx, p += segment_length; } - if (p != p_end) { - av_dlog(avctx, "Junk at end of packet\n"); - return -1; - } - - return buf_size; + return p - buf; } |