diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 01:56:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 17:10:35 +0100 |
| commit | edec2a4da38f8fff91a57bd1174d4b0b6334dbb7 (patch) | |
| tree | 6538178286ad6b8f91cc857c1fd12ee8d1be07b1 | |
| parent | 65074a5daebcb2c6399673af1d9b0ae1f276c5f2 (diff) | |
| download | ffmpeg-edec2a4da38f8fff91a57bd1174d4b0b6334dbb7.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 0e45ab0fed..b74be29a80 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -697,7 +697,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) |