diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-22 20:33:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-22 21:10:37 +0200 |
| commit | d0b21b28a3d348c0302c98cee23c4820cd13e1e2 (patch) | |
| tree | f84427b041d1917fce17ed905ef9192efacc58aa /libavformat/flacdec.c | |
| parent | b0b3676e136a09a13767859f429a0aa416d929cd (diff) | |
| download | ffmpeg-d0b21b28a3d348c0302c98cee23c4820cd13e1e2.tar.gz | |
avformat/flacdec: Fix seeking close to EOF
Fixes Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/flacdec.c')
| -rw-r--r-- | libavformat/flacdec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 19f10629c5..3060dc45fd 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -259,8 +259,10 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde if (ret < 0){ if (ret == AVERROR(EAGAIN)) continue; - else - break; + else { + av_packet_unref(&pkt); + av_assert1(!pkt.size); + } } av_init_packet(&out_pkt); av_parser_parse2(parser, st->internal->avctx, @@ -277,7 +279,8 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde pts = parser->pts; break; } - } + } else if (ret < 0) + break; } av_parser_close(parser); return pts; |