[SCM] libav/experimental: Do not fail DVB sub decoding because of a few padding bytes
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:23:32 UTC 2013
The following commit has been merged in the experimental branch:
commit 4a72765a1c94b05bd3053b1f34f8457a3b71d714
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Wed Feb 9 19:32:07 2011 +0100
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 at jannau.net>
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 8cc8d4f..401144f 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;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list