Commit 5edd076b authored by Johann's avatar Johann Committed by Gerrit Code Review
Browse files

Merge changes Icc7da602,Id166bd8a

* changes:
  Remove last remnants of obj_int_extract
  Initialize "corrupted" to zero
parents 83288c7a 08acc349
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
/ivfenc.dox /ivfenc.dox
/libvpx.so* /libvpx.so*
/libvpx.ver /libvpx.ver
/obj_int_extract
/samples.dox /samples.dox
/test_libvpx /test_libvpx
/vp8_api1_migration.dox /vp8_api1_migration.dox
......
This diff is collapsed.
/*
* Copyright (c) 2011 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vpx_ports/asm_offsets.h"
BEGIN
END
/*
* Copyright (c) 2011 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VPX_PORTS_ASM_OFFSETS_H_
#define VPX_PORTS_ASM_OFFSETS_H_
#include <stddef.h>
#define ct_assert(name,cond) \
static void assert_##name(void) UNUSED;\
static void assert_##name(void) {switch(0){case 0:case !!(cond):;}}
#if INLINE_ASM
#define DEFINE(sym, val) asm("\n" #sym " EQU %0" : : "i" (val))
#define BEGIN int main(void) {
#define END return 0; }
#else
#define DEFINE(sym, val) const int sym = val
#define BEGIN
#define END
#endif
#endif // VPX_PORTS_ASM_OFFSETS_H_
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
PORTS_SRCS-yes += vpx_ports.mk PORTS_SRCS-yes += vpx_ports.mk
PORTS_SRCS-$(BUILD_LIBVPX) += asm_offsets.h
PORTS_SRCS-$(BUILD_LIBVPX) += mem.h PORTS_SRCS-$(BUILD_LIBVPX) += mem.h
PORTS_SRCS-$(BUILD_LIBVPX) += vpx_timer.h PORTS_SRCS-$(BUILD_LIBVPX) += vpx_timer.h
......
/*
* Copyright (c) 2011 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vpx_ports/asm_offsets.h"
BEGIN
END
...@@ -875,7 +875,7 @@ int main_loop(int argc, const char **argv_) { ...@@ -875,7 +875,7 @@ int main_loop(int argc, const char **argv_) {
vpx_codec_iter_t iter = NULL; vpx_codec_iter_t iter = NULL;
vpx_image_t *img; vpx_image_t *img;
struct vpx_usec_timer timer; struct vpx_usec_timer timer;
int corrupted; int corrupted = 0;
frame_avail = 0; frame_avail = 0;
if (!stop_after || frame_in < stop_after) { if (!stop_after || frame_in < stop_after) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment