diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-25 08:36:19 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-08-25 08:36:19 -0400 |
| commit | 180b0306cc637af5bbb7def58f59875f17c69f29 (patch) | |
| tree | 032920068df209b57c945c00271a2dcebd30117e /vp8/vp8_common.mk | |
| parent | d26fafd4e5069417e12a01f8b44d36ce86c6f77b (diff) | |
| parent | 112bd4e2b48317a85ba93c513ef79528aca1bb71 (diff) | |
| download | libvpx-180b0306cc637af5bbb7def58f59875f17c69f29.tar libvpx-180b0306cc637af5bbb7def58f59875f17c69f29.tar.gz libvpx-180b0306cc637af5bbb7def58f59875f17c69f29.tar.bz2 libvpx-180b0306cc637af5bbb7def58f59875f17c69f29.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/common/defaultcoefcounts.h
vp8/common/entropy.c
vp8/encoder/bitstream.c
Change-Id: Idd4990c80d5b5494ac036254694015fab449bc08
Diffstat (limited to 'vp8/vp8_common.mk')
| -rw-r--r-- | vp8/vp8_common.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 1a883b8ab..b6e5a41c2 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -19,8 +19,6 @@ VP8_COMMON_SRCS-yes += common/asm_com_offsets.c VP8_COMMON_SRCS-yes += common/blockd.c VP8_COMMON_SRCS-yes += common/coefupdateprobs.h VP8_COMMON_SRCS-yes += common/debugmodes.c -VP8_COMMON_SRCS-yes += common/defaultcoefcounts.h -VP8_COMMON_SRCS-yes += common/defaultcoefcounts.c VP8_COMMON_SRCS-yes += common/entropy.c VP8_COMMON_SRCS-yes += common/entropymode.c VP8_COMMON_SRCS-yes += common/entropymv.c |