[3/3] lavc/qsvdec: release packet if mpeg2/vp8/vc1 decoding failure

Message ID 1534325975-3005-3-git-send-email-zhong.li@intel.com
State Committed
Commit 69caad8959982580504643d36aef22528e4aa6ce
Headers show
Series
  • [1/3] lavf/qsv: return an error if getting session handle failed
Related show

Commit Message

Li, Zhong Aug. 15, 2018, 9:39 a.m.
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@intel.com>
---
 libavcodec/qsvdec_other.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c
index 150ce0d..47934e9 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;