vpx: merge with master
authorJohn Koleszar <jkoleszar@google.com>
Mon, 5 Nov 2012 20:37:14 +0000 (12:37 -0800)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 6 Nov 2012 20:04:53 +0000 (12:04 -0800)
commit83b1d907daef1db08834093806f125e56fba3370
tree11831ecc5fd5612b5e3b47e342cd2d752c9abfc3
parent807acf17baf7ba839ecc0038cdaee5d17964e612
vpx: merge with master

Change-Id: I44b3ad780cef6f448fa17ff8e28fea87ef9cd518
18 files changed:
vp9/vp9_cx_iface.c
vp9/vp9_dx_iface.c
vpx/internal/vpx_codec_internal.h
vpx/src/vpx_decoder.c
vpx/src/vpx_decoder_compat.c [deleted file]
vpx/src/vpx_encoder.c
vpx/src/vpx_image.c
vpx/vp8.h
vpx/vp8cx.h
vpx/vp8dx.h
vpx/vp8e.h [deleted file]
vpx/vpx_codec.mk
vpx/vpx_decoder.h
vpx/vpx_decoder_compat.h [deleted file]
vpx/vpx_encoder.h
vpx/vpx_image.h
vpx/vpx_integer.h
vpxenc.c