openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 13:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not fail DVB sub decoding because of a few padding bytes

Browse Source 
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 4a72765a1c)
This commit is contained in:
Reimar Döffinger 2011-02-09 19:32:07 +01:00 committed by Michael Niedermayer
parent a30ac54a19
commit 20708223db
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/dvbsubdec.c
View File

@ -1423,7 +1423,7 @@ static int dvbsub_decode(AVCodecContext *avctx,
#endif #endif
if (buf_size <= 2) if (buf_size <= 2 || *buf != 0x0f)
return -1; return -1;
p = buf; p = buf;
@ -1467,12 +1467,7 @@ static int dvbsub_decode(AVCodecContext *avctx,
p += segment_length; p += segment_length;
} }
if (p != p_end) { return p - buf;
av_dlog(avctx, "Junk at end of packet\n");
return -1;
}
return buf_size;
} }