[vlc-commits] aom: treat unsupported bitstream errors as fatal

Tristan Matthews git at videolan.org
Tue Jul 3 17:19:39 CEST 2018


vlc | branch: master | Tristan Matthews <tmatth at videolan.org> | Tue Jul  3 10:18:37 2018 -0400| [1b09b95e0e6c53b5c22ec8bd80c5e71647230514] | committer: Tristan Matthews

aom: treat unsupported bitstream errors as fatal

This avoids repeatedly trying to decode an impossible to decode stream.

Cherry-picked from 0beabcc7725a00de4b03f4a2f5da14756295d640

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

 modules/codec/aom.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/codec/aom.c b/modules/codec/aom.c
index 147fbb51d3..70c0e26c56 100644
--- a/modules/codec/aom.c
+++ b/modules/codec/aom.c
@@ -177,7 +177,10 @@ static int Decode(decoder_t *dec, block_t *block)
     if (err != AOM_CODEC_OK) {
         free(pkt_pts);
         AOM_ERR(dec, ctx, "Failed to decode frame");
-        return VLCDEC_SUCCESS;
+        if (err == AOM_CODEC_UNSUP_BITSTREAM)
+            return VLCDEC_ECRITICAL;
+        else
+            return VLCDEC_SUCCESS;
     }
 
     const void *iter = NULL;



More information about the vlc-commits mailing list