[vlc-commits] aom: flush decoder on close

[Tristan Matthews]

vlc/vlc-3.0 | branch: master | Tristan Matthews <tmatth at videolan.org> | Tue Jul  3 03:23:06 2018 -0400| [e131e1c6c7d4a0e68b13a0e26b0b24a23ef7d943] | committer: Francois Cartegnie

aom: flush decoder on close

Fixes #20788

(cherry picked from commit a5b4bbb9f27c801d1fd1c9650d895c906c191841)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e131e1c6c7d4a0e68b13a0e26b0b24a23ef7d943
---

 modules/codec/aom.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/codec/aom.c b/modules/codec/aom.c
index c6f507dced..003e655eb0 100644
--- a/modules/codec/aom.c
+++ b/modules/codec/aom.c
@@ -289,6 +289,13 @@ static void CloseDecoder(vlc_object_t *p_this)
     decoder_t *dec = (decoder_t *)p_this;
     decoder_sys_t *sys = dec->p_sys;
 
+    /* Flush decoder */
+    aom_codec_err_t err = aom_codec_decode(&sys->ctx, NULL, 0, NULL);
+    if (err != AOM_CODEC_OK)
+    {
+        AOM_ERR(p_this, &sys->ctx, "Failed to flush decoder");
+    }
+
     /* Free our PTS */
     const void *iter = NULL;
     for (;;) {