aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-02 00:27:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-05 04:14:02 +0200
commit8eaefbe1beb551480c68f24d9d5c84bfbc27b465 (patch)
treee9a4a11c8cef046ac5b2016017c497780fd1feed
parent81d8bad786819d8358058fd716f94279c3ccc5eb (diff)
downloadffmpeg-8eaefbe1beb551480c68f24d9d5c84bfbc27b465.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>
-rw-r--r--libavcodec/dvdsub_parser.c2
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);