diff options
author | Mark Thompson <sw@jkqxz.net> | 2018-01-25 22:50:38 +0000 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2018-01-25 22:50:38 +0000 |
commit | 04e4ab44d7c5eca9e1929b34d8fb966afc403e3a (patch) | |
tree | 4417e00efdccb603f831985d9f7b1a1e3939174c | |
parent | b855b570c811d208bfadeb4e140bee90c1598e72 (diff) | |
parent | 559370f2c45110afd8308eec7194437736c323d4 (diff) | |
download | ffmpeg-04e4ab44d7c5eca9e1929b34d8fb966afc403e3a.tar.gz |
Merge commit '559370f2c45110afd8308eec7194437736c323d4'
* commit '559370f2c45110afd8308eec7194437736c323d4':
qsv: Skip the packet if decoding failure
Merged-by: Mark Thompson <sw@jkqxz.net>
-rw-r--r-- | libavcodec/qsvdec_h2645.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 5e0067335e..831252f2d7 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -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; |