OSDN Git Service

avcodec/flac_parser: fix handling EOF if no headers are found
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 00:56:03 +0000 (01:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 01:13:04 +0000 (02:13 +0100)
Fixes assertion failure
Fixes Ticket4269

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4d85fc23c100f7a27d9bad710eb153214868e27)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flac_parser.c

index ba1f060..0512575 100644 (file)
@@ -685,7 +685,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
 handle_error:
     *poutbuf      = NULL;
     *poutbuf_size = 0;
-    return read_end - buf;
+    return buf_size ? read_end - buf : 0;
 }
 
 static av_cold int flac_parse_init(AVCodecParserContext *c)