diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 01:56:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 00:47:05 +0100 |
| commit | ae82abbbcf0ca680d2458f81d431afabd12b7d0c (patch) | |
| tree | 43620e03e6dcbaf7fcffb5bbb7205e48f651b57e | |
| parent | fac6f744d8170585f05e098ce9c9f27eeffa818e (diff) | |
| download | ffmpeg-ae82abbbcf0ca680d2458f81d431afabd12b7d0c.tar.gz | |
avcodec/flac_parser: fix handling EOF if no headers are found
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>
| -rw-r--r-- | libavcodec/flac_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 50ad72b7c0..dac1c26c7e 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -646,7 +646,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 int flac_parse_init(AVCodecParserContext *c) |