Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/vpxdec.c

Index: libvpx/source/libvpx/vpxdec.c
diff --git a/libvpx/source/libvpx/vpxdec.c b/libvpx/source/libvpx/vpxdec.c
index 304608bb3a4c848ad28492eb1d403d8283216b16..ca9af1ec1858fa911d2c5e854a1bf96942ef5b70 100644
--- a/libvpx/source/libvpx/vpxdec.c
+++ b/libvpx/source/libvpx/vpxdec.c
@@ -87,9 +87,6 @@ static const arg_def_t threadsarg = ARG_DEF("t", "threads", 1,
                                     "Max threads to use");
 static const arg_def_t verbosearg = ARG_DEF("v", "verbose", 0,
                                   "Show version string");
-static const arg_def_t error_concealment = ARG_DEF(NULL, "error-concealment", 0,
-                                       "Enable decoder error-concealment");
-
 
 #if CONFIG_MD5
 static const arg_def_t md5arg = ARG_DEF(NULL, "md5", 0,
@@ -103,7 +100,6 @@ static const arg_def_t *all_args[] =
 #if CONFIG_MD5
     &md5arg,
 #endif
-    &error_concealment,
     NULL
 };
 
@@ -577,10 +573,12 @@ file_is_webm(struct input_ctx *input,
 {
     unsigned int i, n;
     int          track_type = -1;
+    uint64_t     tstamp=0;
 
     nestegg_io io = {nestegg_read_cb, nestegg_seek_cb, nestegg_tell_cb,
                      input->infile};
     nestegg_video_params params;
+    nestegg_packet * pkt;
 
     if(nestegg_init(&input->nestegg_ctx, io, NULL))
         goto fail;
@@ -704,7 +702,6 @@ int main(int argc, const char **argv_)
     FILE                  *infile;
     int                    frame_in = 0, frame_out = 0, flipuv = 0, noblit = 0, do_md5 = 0, progress = 0;
     int                    stop_after = 0, postproc = 0, summary = 0, quiet = 1;
-    int                    ec_enabled = 0;
     vpx_codec_iface_t       *iface = NULL;
     unsigned int           fourcc;
     unsigned long          dx_time = 0;
@@ -728,8 +725,6 @@ int main(int argc, const char **argv_)
     int                     vp8_dbg_display_mv = 0;
 #endif
     struct input_ctx        input = {0};
-    int                     frames_corrupted = 0;
-    int                     dec_flags = 0;
 
     /* Parse command line */
     exec_name = argv_[0];
@@ -849,10 +844,6 @@ int main(int argc, const char **argv_)
                 vp8_dbg_display_mv = flags;
             }
         }
-        else if (arg_match(&arg, &error_concealment, argi))
-        {
-            ec_enabled = 1;
-        }
 
 #endif
         else
@@ -973,10 +964,8 @@ int main(int argc, const char **argv_)
             break;
         }
 
-    dec_flags = (postproc ? VPX_CODEC_USE_POSTPROC : 0) |
-                (ec_enabled ? VPX_CODEC_USE_ERROR_CONCEALMENT : 0);
     if (vpx_codec_dec_init(&decoder, iface ? iface :  ifaces[0].iface, &cfg,
-                           dec_flags))
+                           postproc ? VPX_CODEC_USE_POSTPROC : 0))
     {
         fprintf(stderr, "Failed to initialize decoder: %s\n", vpx_codec_error(&decoder));
         return EXIT_FAILURE;
@@ -1029,7 +1018,6 @@ int main(int argc, const char **argv_)
         vpx_codec_iter_t  iter = NULL;
         vpx_image_t    *img;
         struct vpx_usec_timer timer;
-        int                   corrupted;
 
         vpx_usec_timer_start(&timer);
 
@@ -1049,14 +1037,6 @@ int main(int argc, const char **argv_)
 
         ++frame_in;
 
-        if (vpx_codec_control(&decoder, VP8D_GET_FRAME_CORRUPTED, &corrupted))
-        {
-            fprintf(stderr, "Failed VP8_GET_FRAME_CORRUPTED: %s\n",
-                    vpx_codec_error(&decoder));
-            goto fail;
-        }
-        frames_corrupted += corrupted;
-
         if ((img = vpx_codec_get_frame(&decoder, &iter)))
             ++frame_out;
 
@@ -1122,9 +1102,6 @@ int main(int argc, const char **argv_)
         fprintf(stderr, "\n");
     }
 
-    if (frames_corrupted)
-        fprintf(stderr, "WARNING: %d frames corrupted.\n",frames_corrupted);
-
 fail:
 
     if (vpx_codec_destroy(&decoder))
@@ -1143,5 +1120,5 @@ fail:
     fclose(infile);
     free(argv);
 
-    return frames_corrupted ? EXIT_FAILURE : EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }