generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes I13d975d1,I26710359

Browse Source 
* changes:
  vpxenc: fix compile with --disable-libyuv
  vpxdec: fix compile with --disable-libyuv
This commit is contained in:
James Zern 2014-08-19 15:16:29 -07:00 committed by Gerrit Code Review
commit 7b0faffcf8
2 changed files with 10 additions and 2 deletions

7
vpxdec.c

@ -15,13 +15,16 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include "./vpx_config.h"
#if CONFIG_LIBYUV
#include "third_party/libyuv/include/libyuv/scale.h" #include "third_party/libyuv/include/libyuv/scale.h"
#endif
#include "./args.h" #include "./args.h"
#include "./ivfdec.h" #include "./ivfdec.h"
#define VPX_CODEC_DISABLE_COMPAT 1 #define VPX_CODEC_DISABLE_COMPAT 1
#include "./vpx_config.h"
#include "vpx/vpx_decoder.h" #include "vpx/vpx_decoder.h"
#include "vpx_ports/mem_ops.h" #include "vpx_ports/mem_ops.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
@ -123,6 +126,7 @@ static const arg_def_t *vp8_pp_args[] = {
}; };
#endif #endif
#if CONFIG_LIBYUV
static INLINE int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst, static INLINE int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst,
FilterModeEnum mode) { FilterModeEnum mode) {
assert(src->fmt == VPX_IMG_FMT_I420); assert(src->fmt == VPX_IMG_FMT_I420);
@ -137,6 +141,7 @@ static INLINE int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst,
dst->d_w, dst->d_h, dst->d_w, dst->d_h,
mode); mode);
} }
#endif
void usage_exit() { void usage_exit() {
int i; int i;

5
vpxenc.c

@ -19,12 +19,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if CONFIG_LIBYUV
#include "third_party/libyuv/include/libyuv/scale.h"
#endif
#include "vpx/vpx_encoder.h" #include "vpx/vpx_encoder.h"
#if CONFIG_DECODERS #if CONFIG_DECODERS
#include "vpx/vpx_decoder.h" #include "vpx/vpx_decoder.h"
#endif #endif
#include "third_party/libyuv/include/libyuv/scale.h"
#include "./args.h" #include "./args.h"
#include "./ivfenc.h" #include "./ivfenc.h"
#include "./tools_common.h" #include "./tools_common.h"