source/libvpx/vp8/vp8dx.mk - Issue 11974002: libvpx: Pull from upstream

Side by Side Diff: source/libvpx/vp8/vp8dx.mk

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « source/libvpx/vp8/vp8cx_arm.mk ('k') | source/libvpx/vp8_multi_resolution_encoder.c » ('j') | no next file with comments »

OLD	NEW
1 ##	1 ##

2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.	2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.

3 ##	3 ##

4 ## Use of this source code is governed by a BSD-style license	4 ## Use of this source code is governed by a BSD-style license

5 ## that can be found in the LICENSE file in the root of the source	5 ## that can be found in the LICENSE file in the root of the source

6 ## tree. An additional intellectual property rights grant can be found	6 ## tree. An additional intellectual property rights grant can be found

7 ## in the file PATENTS. All contributing project authors may	7 ## in the file PATENTS. All contributing project authors may

8 ## be found in the AUTHORS file in the root of the source tree.	8 ## be found in the AUTHORS file in the root of the source tree.

9 ##	9 ##

10	10

11	11

12 VP8_DX_EXPORTS += exports_dec	12 VP8_DX_EXPORTS += exports_dec

13	13

14 VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes)	14 VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes)

15 VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no)	15 VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no)

16 VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes)	16 VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes)

17 VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no)	17 VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no)

18	18

	19 VP8_DX_SRCS-yes += vp8dx.mk

	20

19 VP8_DX_SRCS-yes += vp8_dx_iface.c	21 VP8_DX_SRCS-yes += vp8_dx_iface.c

20	22

21 VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c	23 VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c

22 VP8_DX_SRCS-yes += decoder/dboolhuff.c	24 VP8_DX_SRCS-yes += decoder/dboolhuff.c

23 VP8_DX_SRCS-yes += decoder/decodemv.c	25 VP8_DX_SRCS-yes += decoder/decodemv.c

24 VP8_DX_SRCS-yes += decoder/decodframe.c	26 VP8_DX_SRCS-yes += decoder/decodframe.c

25 VP8_DX_SRCS-yes += decoder/detokenize.c	27 VP8_DX_SRCS-yes += decoder/detokenize.c

26 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/ec_types.h	28 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/ec_types.h

27 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.h	29 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.h

28 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.c	30 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.c

29 VP8_DX_SRCS-yes += decoder/dboolhuff.h	31 VP8_DX_SRCS-yes += decoder/dboolhuff.h

30 VP8_DX_SRCS-yes += decoder/decodemv.h	32 VP8_DX_SRCS-yes += decoder/decodemv.h

31 VP8_DX_SRCS-yes += decoder/decoderthreading.h	33 VP8_DX_SRCS-yes += decoder/decoderthreading.h

32 VP8_DX_SRCS-yes += decoder/detokenize.h	34 VP8_DX_SRCS-yes += decoder/detokenize.h

33 VP8_DX_SRCS-yes += decoder/onyxd_int.h	35 VP8_DX_SRCS-yes += decoder/onyxd_int.h

34 VP8_DX_SRCS-yes += decoder/treereader.h	36 VP8_DX_SRCS-yes += decoder/treereader.h

35 VP8_DX_SRCS-yes += decoder/onyxd_if.c	37 VP8_DX_SRCS-yes += decoder/onyxd_if.c

36 VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/threading.c	38 VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/threading.c

37	39

38 VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes))	40 VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes))

39	41

40 $(eval $(call asm_offsets_template,\	42 $(eval $(call asm_offsets_template,\

41 vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/asm_dec_offsets.c))	43 vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/asm_dec_offsets.c))

OLD	NEW