Browse Source

avcodec: consider an error during decoder draining as EOF

There is no reason that draining couldn't return an error or two. But
some decoders don't handle this very well, and might always return an
error. This can lead to API users getting into an infinite loop and
burning CPU, because no progress is made and EOF is never returned.

In fact, ffmpeg.c contains a hack against such a case. It is made
unnecessary with this commit, and removed with the next one. (This
particular error case seems to have been fixed since the hack was
added, though.)

This might lose frames if decoding returns errors during draining.
tags/n3.3
wm4 8 years ago
parent
commit
a755b725ec
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavcodec/utils.c

+ 3
- 3
libavcodec/utils.c View File

@@ -2807,12 +2807,12 @@ static int do_decode(AVCodecContext *avctx, AVPacket *pkt)
if (ret == AVERROR(EAGAIN))
ret = pkt->size;

if (ret < 0)
return ret;

if (avctx->internal->draining && !got_frame)
avctx->internal->draining_done = 1;

if (ret < 0)
return ret;

if (ret >= pkt->size) {
av_packet_unref(avctx->internal->buffer_pkt);
} else {


Loading…
Cancel
Save