Browse Source

Merge commit '559370f2c45110afd8308eec7194437736c323d4'

* commit '559370f2c45110afd8308eec7194437736c323d4':
  qsv: Skip the packet if decoding failure

Merged-by: Mark Thompson <sw@jkqxz.net>
tags/n4.0
Mark Thompson 7 years ago
parent
commit
04e4ab44d7
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libavcodec/qsvdec_h2645.c

+ 5
- 1
libavcodec/qsvdec_h2645.c View File

@@ -153,8 +153,12 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data,
}

ret = ff_qsv_process_data(avctx, &s->qsv, frame, got_frame, &s->buffer_pkt);
if (ret < 0)
if (ret < 0){
/* Drop buffer_pkt when failed to decode the packet. Otherwise,
the decoder will keep decoding the failure packet. */
av_packet_unref(&s->buffer_pkt);
return ret;
}

s->buffer_pkt.size -= ret;
s->buffer_pkt.data += ret;


Loading…
Cancel
Save