diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 00:27:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 01:27:02 +0200 |
| commit | aa0a8ef50e88e89a5c50dbf7ffc448a1a4315759 (patch) | |
| tree | 87791d8ad5fa1a038314257b79275a2854d9d83f /libavcodec | |
| parent | d6173ae341fabacf05608ceb7470d24befdbdc68 (diff) | |
| download | ffmpeg-aa0a8ef50e88e89a5c50dbf7ffc448a1a4315759.tar.gz | |
avcodec/dvdsub_parser: never return 0 when the input isnt 0
Fixes a infinite loop
Fixes Ticket3804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cfdb30d2f1241de9354a8efdbf8252d0f1a6f933)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dvdsub_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c index e50c3396e4..9a6457e8b4 100644 --- a/libavcodec/dvdsub_parser.c +++ b/libavcodec/dvdsub_parser.c @@ -46,7 +46,7 @@ static int dvdsub_parse(AVCodecParserContext *s, if (pc->packet_index == 0) { if (buf_size < 2) - return 0; + return buf_size; pc->packet_len = AV_RB16(buf); if (pc->packet_len == 0) /* HD-DVD subpicture packet */ pc->packet_len = AV_RB32(buf+2); |