Browse Source

qsvdec: avoid an infinite loop with no consumed data and no output

This is triggerable with the HEVC decoder. It is unclear yet whether the
bug is in the calling code or the MSDK, but it seems better to check for
this in any case.
tags/n2.8
Anton Khirnov 10 years ago
parent
commit
aa9d15d89b
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      libavcodec/qsvdec.c

+ 7
- 0
libavcodec/qsvdec.c View File

@@ -245,6 +245,13 @@ int ff_qsv_decode(AVCodecContext *avctx, QSVContext *q,
return ff_qsv_error(ret);
}

/* make sure we do not enter an infinite loop if the SDK
* did not consume any data and did not return anything */
if (!sync && !bs.DataOffset) {
av_log(avctx, AV_LOG_WARNING, "A decode call did not consume any data\n");
bs.DataOffset = avpkt->size;
}

if (sync) {
QSVFrame *out_frame = find_frame(q, outsurf);



Loading…
Cancel
Save