Merge commit '69caad8959982580504643d36aef22528e4aa6ce'

* commit '69caad8959982580504643d36aef22528e4aa6ce':
  qsvdec: Release packet on decoding failure for  mpeg2/vp8/vc1

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-09-11 13:42:09 -03:00
commit 23ce57af3a

View File

@ -138,8 +138,13 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data,
} }
ret = ff_qsv_process_data(avctx, &s->qsv, frame, got_frame, &s->input_ref); ret = ff_qsv_process_data(avctx, &s->qsv, frame, got_frame, &s->input_ref);
if (ret < 0) if (ret < 0) {
/* Drop input packet when failed to decode the packet. Otherwise,
the decoder will keep decoding the failure packet. */
av_packet_unref(&s->input_ref);
return ret; return ret;
}
s->input_ref.size -= ret; s->input_ref.size -= ret;
s->input_ref.data += ret; s->input_ref.data += ret;