shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vpxdec: return fail if frame fails to decode."

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -9,11 +9,11 @@

  */

 #include <assert.h>

+#include <limits.h>

+#include <stdarg.h>

 #include <stdio.h>

 #include <stdlib.h>

-#include <stdarg.h>

 #include <string.h>

-#include <limits.h>

 #include "./vpx_config.h"

@@ -780,8 +780,8 @@

           const char *detail = vpx_codec_error_detail(&decoder);

           warn("Failed to decode frame %d: %s", frame_in,

                vpx_codec_error(&decoder));

-

           if (detail) warn("Additional information: %s", detail);

+          frames_corrupted++;

           if (!keep_going) goto fail;

         }

@@ -800,6 +800,8 @@

       // Flush the decoder in frame parallel decode.

       if (vpx_codec_decode(&decoder, NULL, 0, NULL, 0)) {

         warn("Failed to flush decoder: %s", vpx_codec_error(&decoder));

+        frames_corrupted++;

+        if (!keep_going) goto fail;

       }

     }