[FFmpeg-cvslog] qsvdec: Release packet on decoding failure for mpeg2/vp8/vc1
Zhong Li
git at videolan.org
Tue Sep 11 19:43:20 EEST 2018
ffmpeg | branch: master | Zhong Li <zhong.li at intel.com> | Wed Aug 15 17:39:35 2018 +0800| [69caad8959982580504643d36aef22528e4aa6ce] | committer: Luca Barbato
qsvdec: Release packet on decoding failure for mpeg2/vp8/vc1
H264/265 have been fixed such an issue with commit
559370f2c45110afd8308eec7194437736c323d4.
Similar fixing is needed for other codecs.
Signed-off-by: Zhong Li <zhong.li at intel.com>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69caad8959982580504643d36aef22528e4aa6ce
---
libavcodec/qsvdec_other.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c
index 150ce0d2ad..47934e9530 100644
--- a/libavcodec/qsvdec_other.c
+++ b/libavcodec/qsvdec_other.c
@@ -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);
- 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;
+ }
s->input_ref.size -= ret;
s->input_ref.data += ret;
More information about the ffmpeg-cvslog
mailing list